[Libreoffice-commits] core.git: vcl/inc
vcl/inc/headless/svpbmp.hxx |2 +- vcl/inc/headless/svpdummies.hxx |3 ++- vcl/inc/headless/svpgdi.hxx |2 +- 3 files changed, 4 insertions(+), 3 deletions(-) New commits: commit 98bda6b40e21b4b9dff239ccfb6480de25d6393b Author: Tor Lillqvist t...@collabora.com Date: Fri Dec 13 10:28:17 2013 +0200 Follow header guard convention Change-Id: I4cf80fb61fd63b10e241154785ae872c6b75eaf7 diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx index 861e53e..2e96584 100644 --- a/vcl/inc/headless/svpbmp.hxx +++ b/vcl/inc/headless/svpbmp.hxx @@ -61,6 +61,6 @@ public: static sal_uInt32 getBitCountFromScanlineFormat( basebmp::Format nFormat ); }; -#endif +#endif // INCLUDED_VCL_INC_HEADLESS_SVPBMP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx index 157f6a0..49c2f99 100644 --- a/vcl/inc/headless/svpdummies.hxx +++ b/vcl/inc/headless/svpdummies.hxx @@ -18,6 +18,7 @@ */ #ifndef INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX +#define INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX #include vcl/sysdata.hxx #include generic/gensys.h @@ -75,6 +76,6 @@ public: }; -#endif // _SVP_SVPDUMMIES_H +#endif // INCLUDED_VCL_INC_HEADLESS_SVPDUMMIES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index d04f020..8e38bd2 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -226,6 +226,6 @@ public: #endif }; -#endif +#endif // INCLUDED_VCL_INC_HEADLESS_SVPGDI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - bin/get-bugzilla-attachments-by-mimetype writerperfect/Library_wpftimpress.mk writerperfect/source writerperfect/StaticLibrary_writerperfect.mk
bin/get-bugzilla-attachments-by-mimetype |5
writerperfect/Library_wpftimpress.mk |1
writerperfect/StaticLibrary_writerperfect.mk |1
writerperfect/source/common/DirectoryStream.cxx | 164 ++
writerperfect/source/common/DirectoryStream.hxx | 48
writerperfect/source/impress/KeynoteImportFilter.cxx | 218 +--
6 files changed, 422 insertions(+), 15 deletions(-)
New commits:
commit af8191d2fa6bc7fce9020fd75c44c78d87cc1d75
Author: David Tardon dtar...@redhat.com
Date: Fri Dec 13 09:29:58 2013 +0100
do not download html files from moz bz
Change-Id: I18519dd8ad0bdaac55a1d5bccdc30b943d717c9c
diff --git a/bin/get-bugzilla-attachments-by-mimetype
b/bin/get-bugzilla-attachments-by-mimetype
index 4aed0e6..d9e03e5 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -448,6 +448,11 @@ common_noncore_mimetypes = {
for (prefix, uri) in rss_bugzillas.items():
for (mimetype,extension) in mimetypes.items():
+# It seems that bugzilla has problems returing that many results
+# (1 results is probably a limit set somewhere) so we always
+# end processing the complete list.
+if mimetype == 'text/html' and prefix == 'moz':
+continue
get_through_rss_query(uri, mimetype, prefix, extension)
for (mimetype,extension) in mimetypes.items():
commit 735dc598cd38c76aeeaa37df57f1d0018fe294c8
Author: David Tardon dtar...@redhat.com
Date: Mon Dec 9 20:11:43 2013 +0100
handle Keynote package format too
Change-Id: I3023bcba0a3d3bd83aca56e4ef72a892da5b55cf
diff --git a/writerperfect/Library_wpftimpress.mk
b/writerperfect/Library_wpftimpress.mk
index cb69f98..08cdd12 100644
--- a/writerperfect/Library_wpftimpress.mk
+++ b/writerperfect/Library_wpftimpress.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,wpftimpress,\
sal \
sot \
tl \
+ ucbhelper \
utl \
xo \
$(gb_UWINAPI) \
diff --git a/writerperfect/StaticLibrary_writerperfect.mk
b/writerperfect/StaticLibrary_writerperfect.mk
index d6b7ab5..6b21c02 100644
--- a/writerperfect/StaticLibrary_writerperfect.mk
+++ b/writerperfect/StaticLibrary_writerperfect.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_StaticLibrary_use_api,writerperfect,\
))
$(eval $(call gb_StaticLibrary_add_exception_objects,writerperfect,\
+ writerperfect/source/common/DirectoryStream \
writerperfect/source/common/DocumentHandler \
writerperfect/source/common/WPXSvStream \
))
diff --git a/writerperfect/source/common/DirectoryStream.cxx
b/writerperfect/source/common/DirectoryStream.cxx
new file mode 100644
index 000..14b37f3
--- /dev/null
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -0,0 +1,164 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* writerperfect
+ * Version: MPL 2.0 / LGPLv2.1+
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2007 Fridrich Strba (fridrich.st...@bluewin.ch)
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms
+ * of the GNU Lesser General Public License Version 2.1 or later
+ * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
+ * applicable instead of those above.
+ *
+ * For further information visit http://libwpd.sourceforge.net
+ */
+
+#include com/sun/star/io/XInputStream.hpp
+#include com/sun/star/sdbc/XResultSet.hpp
+#include com/sun/star/sdbc/XRow.hpp
+#include com/sun/star/ucb/XContent.hpp
+#include com/sun/star/ucb/XContentAccess.hpp
+#include com/sun/star/ucb/XCommandEnvironment.hpp
+
+#include com/sun/star/uno/Reference.hxx
+#include com/sun/star/uno/Sequence.hxx
+
+#include comphelper/processfactory.hxx
+
+#include rtl/ustring.hxx
+
+#include ucbhelper/content.hxx
+
+#include DirectoryStream.hxx
+#include WPXSvStream.hxx
+
+namespace io = com::sun::star::io;
+namespace sdbc = com::sun::star::sdbc;
+namespace ucb = com::sun::star::ucb;
+namespace uno = com::sun::star::uno;
+
+namespace writerperfect
+{
+
+namespace
+{
+
+struct NotADirectoryException
+{
+};
+
+}
+
+namespace
+{
+
+uno::Referenceio::XInputStream findStream(ucbhelper::Content rContent,
const rtl::OUString rName)
+{
+uno::Referenceio::XInputStream xInputStream;
+
+uno::Sequencertl::OUString lPropNames(1);
+lPropNames[0] = Title;
+try
+{
+const uno::Referencesdbc::XResultSet xResultSet(
+rContent.createCursor(lPropNames,
ucbhelper::INCLUDE_DOCUMENTS_ONLY));
+if (xResultSet-first())
+{
+const uno::Referenceucb::XContentAccess
xContentAccess(xResultSet,
Re: l10n process, en_US version, Help files
Hi Mat, Le 12/12/2013 22:56, Mat M a écrit : Hi all My grain of salt there. I strongly believe we need to cross-talk, so I go on cross-posting. Thanks a lot for your input, jumping to my question: [...] * And... fixing ! Easy hacks or l10n sessions to fix that are both valid choices. We may want to automate finding occurrences of text in the code. We began with fdo#39439, but further steps are required. did you submit your work, is it now integrated? Kind regards Sophie ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - framework/source
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 26 ++--
1 file changed, 11 insertions(+), 15 deletions(-)
New commits:
commit 171f2ca39a08299abe54e92e8096cdaa5e02a4dc
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Nov 15 10:59:36 2013 +0100
fdo#66864: Return from full-screen should restore toolbars.
The fix for fdo#37758 was not correct, we shouldn't fiddle with the
m_bVisible
itself, but instead react on the m_bMasterHide flag; or at least that is my
understanding of the related framework code (why is it so confusing?!)
Change-Id: I791fcea9e5e5313b6a5b776cb3187cbd1a028386
(cherry picked from commit 986644335c3f9e99ec3c6bebc0b75cca0acdf79b)
Reviewed-on: https://gerrit.libreoffice.org/7065
Reviewed-by: Jan Holesovsky ke...@collabora.com
Tested-by: Jan Holesovsky ke...@collabora.com
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 52a0d7b..1bb03d1 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -294,7 +294,7 @@ Rectangle ToolbarLayoutManager::implts_calcDockingArea()
SolarMutexGuard aGuard;
Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
-if ( pWindow !xDockWindow-isFloating()
pConstIter-m_bVisible )
+if ( pWindow !xDockWindow-isFloating()
pConstIter-m_bVisible !pConstIter-m_bMasterHide )
{
awt::Rectangle aPosSize = xWindow-getPosSize();
if ( pConstIter-m_aDockedData.m_nDockedArea !=
nCurrDockingArea )
@@ -442,7 +442,7 @@ bool ToolbarLayoutManager::requestToolbar( const OUString
rResourceURL )
if ( !xUIElement.is() )
bMustCallCreate = true;
-bool bCreateOrShowToolbar( aRequestedToolbar.m_bVisible
!aRequestedToolbar.m_bMasterHide );
+bool bCreateOrShowToolbar( aRequestedToolbar.m_bVisible
!aRequestedToolbar.m_bMasterHide );
uno::Reference awt::XWindow2 xContainerWindow( m_xContainerWindow,
uno::UNO_QUERY );
if ( xContainerWindow.is() aRequestedToolbar.m_bFloating )
@@ -681,28 +681,24 @@ void ToolbarLayoutManager::setVisible( bool bVisible )
UIElementVector::iterator pIter;
for ( pIter = aUIElementVector.begin(); pIter != aUIElementVector.end();
++pIter )
{
-pIter-m_bMasterHide = !bVisible;
+if (!pIter-m_bFloating)
+{
+UIElement aUIElement(*pIter);
+aUIElement.m_bMasterHide = !bVisible;
+implts_setToolbar(aUIElement);
+implts_setLayoutDirty();
+}
+
Window* pWindow = getWindowFromXUIElement( pIter-m_xUIElement );
if ( pWindow )
{
-bool bSetVisible( pIter-m_bVisible bVisible );
+bool bSetVisible( pIter-m_bVisible bVisible );
if ( !bSetVisible )
-{
pWindow-Hide();
-
-UIElement aUIElement( *pIter );
-if ( !aUIElement.m_bFloating )
-implts_setLayoutDirty();
-
-aUIElement.m_bVisible = false;
-implts_setToolbar( aUIElement );
-}
else
{
if ( pIter-m_bFloating )
pWindow-Show(true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
-else
-implts_setLayoutDirty();
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/inc bridges/source chart2/inc connectivity/source idlc/source sal/osl
bridges/inc/bridges/cpp_uno/bridge.hxx
| 10 --
bridges/source/cpp_uno/shared/component.cxx
|9 +++--
bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
|7 ---
chart2/inc/GL/glew.h
|2 --
connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
|4
connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
|4
connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
|4
connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
|4
connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
|4
connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
|4
connectivity/source/drivers/mozab/post_include_mozilla.h
|2 --
connectivity/source/drivers/mozab/pre_include_mozilla.h
|2 --
connectivity/source/parse/sqlbison.y
|8 ++--
connectivity/source/parse/sqlflex.l
|8 ++--
idlc/source/parser.y
|4 +---
idlc/source/scanner.l
|2 --
sal/osl/unx/security.c
|5 -
17 files changed, 8 insertions(+), 75 deletions(-)
New commits:
commit c69b6417af9d03b81813e6d56cdd082d511aef24
Author: Jelle van der Waa je...@vdwaa.nl
Date: Thu Dec 12 21:42:10 2013 +0100
fdo#72598 Remove SunStudio cruft from code base
Change-Id: Ia6799c852eb95d496fbc8dcfdabde62dffc263a6
Reviewed-on: https://gerrit.libreoffice.org/7066
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/bridges/inc/bridges/cpp_uno/bridge.hxx
b/bridges/inc/bridges/cpp_uno/bridge.hxx
index 15d8eb8..ba9a847 100644
--- a/bridges/inc/bridges/cpp_uno/bridge.hxx
+++ b/bridges/inc/bridges/cpp_uno/bridge.hxx
@@ -379,17 +379,11 @@ inline void SAL_CALL cppu_ext_getMapping(
//##
//##
-#if (defined(__SUNPRO_CC) (__SUNPRO_CC == 0x500))
-static OUString * s_pStaticOidPart = 0;
-#endif
-
// environment init stuff
//--
inline const OUString SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
{
-#if ! (defined(__SUNPRO_CC) (__SUNPRO_CC == 0x500))
static OUString * s_pStaticOidPart = 0;
-#endif
if (! s_pStaticOidPart)
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
@@ -404,12 +398,8 @@ inline const OUString SAL_CALL
cppu_cppenv_getStaticOIdPart() SAL_THROW(())
{
aRet.append( (sal_Int32)ar[i], 16 );
}
-#if (defined(__SUNPRO_CC) (__SUNPRO_CC == 0x500))
-s_pStaticOidPart = new OUString( aRet.makeStringAndClear() );
-#else
static OUString s_aStaticOidPart( aRet.makeStringAndClear() );
s_pStaticOidPart = s_aStaticOidPart;
-#endif
}
}
return *s_pStaticOidPart;
diff --git a/bridges/source/cpp_uno/shared/component.cxx
b/bridges/source/cpp_uno/shared/component.cxx
index a7d2e22..bacd9a7 100644
--- a/bridges/source/cpp_uno/shared/component.cxx
+++ b/bridges/source/cpp_uno/shared/component.cxx
@@ -41,15 +41,13 @@ namespace bridges { namespace cpp_uno { namespace shared {
namespace {
-#if (defined(__SUNPRO_CC) (__SUNPRO_CC == 0x500)) \
-|| (defined(__GNUC__) defined(__APPLE__))
+#if (defined(__GNUC__) defined(__APPLE__))
static OUString * s_pStaticOidPart = 0;
#endif
const OUString SAL_CALL cppu_cppenv_getStaticOIdPart() SAL_THROW(())
{
-#if ! ((defined(__SUNPRO_CC) (__SUNPRO_CC == 0x500)) \
-|| (defined(__GNUC__) defined(__APPLE__)))
+#if ! (defined(__GNUC__) defined(__APPLE__))
static OUString * s_pStaticOidPart = 0;
#endif
if (! s_pStaticOidPart)
@@ -66,8 +64,7 @@ const OUString SAL_CALL cppu_cppenv_getStaticOIdPart()
SAL_THROW(())
{
aRet.append( (sal_Int32)ar[i], 16 );
}
-#if (defined(__SUNPRO_CC) (__SUNPRO_CC == 0x500)) \
-|| (defined(__GNUC__) defined(__APPLE__))
+#if (defined(__GNUC__) defined(__APPLE__))
s_pStaticOidPart = new OUString( aRet.makeStringAndClear() );
#else
static OUString s_aStaticOidPart(
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
[Bug 72598] [Easyhack] Remove SunStudio cruft from code base
https://bugs.freedesktop.org/show_bug.cgi?id=72598 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillScript SkillCpp|SkillScript SkillCpp |TopicCleanup|TopicCleanup target:4.3.0 --- Comment #2 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Jelle van der Waa committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=c69b6417af9d03b81813e6d56cdd082d511aef24 fdo#72598 Remove SunStudio cruft from code base The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 62653, which changed state. Bug 62653 Summary: EDITING: segfault on nested table delete https://bugs.freedesktop.org/show_bug.cgi?id=62653 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] core.git: sfx2/source
sfx2/source/doc/objserv.cxx |5 +
sfx2/source/doc/sfxbasemodel.cxx | 12 +++-
2 files changed, 8 insertions(+), 9 deletions(-)
New commits:
commit a68e0e334df02c1ca47601575523b23c6db13470
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Fri Dec 13 10:36:32 2013 +0100
Fixed the update to working copy and back after (cancel) checkout: fdo#64533
After Checkout, simply set medium name and update the medium: at least
we are sure it works in more situations than the other function we used.
After cancel checkout, call SID_RELOAD to actually revert any local
change.
Change-Id: I3dc296a74726770c4f47d9653c382108f7baccad
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index a6f445a..fb29227 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -897,6 +897,11 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest rReq)
if ( QueryBox( NULL, SfxResId( RID_QUERY_CANCELCHECKOUT )
).Execute( ) == RET_YES )
{
CancelCheckOut( );
+
+// Reload the document as we may still have local changes
+SfxViewFrame *pFrame = GetFrame();
+if ( pFrame )
+pFrame-GetDispatcher()-Execute(SID_RELOAD);
}
break;
}
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 14ca59f..0392c54 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2519,7 +2519,8 @@ void SAL_CALL SfxBaseModel::checkOut( ) throw (
RuntimeException )
OUString sURL;
aResult = sURL;
-m_pData-m_pObjectShell-GetMedium( )-SwitchDocumentToFile( sURL
);
+m_pData-m_pObjectShell-GetMedium( )-SetName( sURL );
+m_pData-m_pObjectShell-GetMedium( )-GetMedium_Impl( );
m_pData-m_xDocumentProperties-setTitle( getTitle( ) );
Sequence beans::PropertyValue aSequence ;
TransformItems( SID_OPENDOC, *pMedium-GetItemSet(), aSequence );
@@ -2550,14 +2551,7 @@ void SAL_CALL SfxBaseModel::cancelCheckOut( ) throw (
RuntimeException )
OUString sURL;
aResult = sURL;
-m_pData-m_pObjectShell-GetMedium( )-SwitchDocumentToFile( sURL
);
-m_pData-m_xDocumentProperties-setTitle( getTitle( ) );
-Sequence beans::PropertyValue aSequence ;
-TransformItems( SID_OPENDOC, *pMedium-GetItemSet(), aSequence );
-attachResource( sURL, aSequence );
-
-// Reload the CMIS properties
-loadCmisProperties( );
+m_pData-m_pObjectShell-GetMedium( )-SetName( sURL );
}
catch ( const Exception e )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/Library_wpftimpress.mk
writerperfect/Library_wpftimpress.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 8407174c8b4ec01a8d396ae8c8254e19d405c4cb Author: Stephan Bergmann sberg...@redhat.com Date: Fri Dec 13 10:55:03 2013 +0100 Missing boost_headers Change-Id: I4ce444b14bd4667ce4c823fe70e0b79e562999aa diff --git a/writerperfect/Library_wpftimpress.mk b/writerperfect/Library_wpftimpress.mk index 08cdd12..f8a8a15 100644 --- a/writerperfect/Library_wpftimpress.mk +++ b/writerperfect/Library_wpftimpress.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_static_libraries,wpftimpress,\ )) $(eval $(call gb_Library_use_externals,wpftimpress,\ + boost_headers \ etonyek \ odfgen \ wpd \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/vcl toolkit/source
include/vcl/window.hxx |7 ---
toolkit/source/helper/unowrapper.cxx | 32
2 files changed, 39 deletions(-)
New commits:
commit dcdf3cd1983b673eb1ed1a5c23b68ba46fe4dd1b
Author: Tor Lillqvist t...@collabora.com
Date: Fri Dec 13 11:12:43 2013 +0200
Bin unused or duplicate forward class declarations
Change-Id: Ic6fbb345e333d67f967a3ea09a5a90ecef910040
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 8593fb0..fc7e2e0 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -42,13 +42,11 @@
class VirtualDevice;
struct ImplDelData;
struct ImplWinData;
-struct ImplOverlapData;
struct ImplFrameData;
struct ImplCalcToTopData;
struct SystemEnvData;
struct SystemParentData;
class ImplBorderWindow;
-class VirtualDevice;
class Timer;
class Cursor;
class DockingManager;
@@ -65,12 +63,8 @@ class DataChangedEvent;
class NotifyEvent;
class SystemWindow;
class SalFrame;
-class SalObject;
class MenuFloatingWindow;
-// Nur fuer ExecuteDrag:
-struct IDataObject;
class VCLXWindow;
-struct ImplAccessibleInfos;
namespace com {
namespace sun {
commit b677fa9d4886d94d9b6d12e091c159655deb2d3f
Author: Tor Lillqvist t...@collabora.com
Date: Fri Dec 13 11:00:43 2013 +0200
UNOWindowData has been dead since the year 2000 at least
Change-Id: I8d3079f5b508008a4c25a4baa604fc89c81aab33
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index a8d6883..8593fb0 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -67,7 +67,6 @@ class SystemWindow;
class SalFrame;
class SalObject;
class MenuFloatingWindow;
-class UNOWindowData;
// Nur fuer ExecuteDrag:
struct IDataObject;
class VCLXWindow;
diff --git a/toolkit/source/helper/unowrapper.cxx
b/toolkit/source/helper/unowrapper.cxx
index c317e6f..84d87e4 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -205,38 +205,6 @@ void UnoWrapper::ReleaseAllGraphics( OutputDevice* pOutDev
)
}
-// It was once called in the Window-CTOR to make listeners of the Container
-// to react. This didn't really work, as the interface within the Window-CTOR
-// was not ready.
-// = Call only the listener, when created through
::com::sun::star::awt::Toolkit
-
-/*
-void ImplSmartWindowCreated( Window* pNewWindow )
-{
-UNOWindowData* pParentUNOData = pNewWindow-GetParent() ?
-pNewWindow-GetParent()-GetUNOData() : NULL;
-
-if ( pParentUNOData pParentUNOData-GetListeners( EL_CONTAINER ) )
-{
-UNOWindowData* pUNOData = pNewWindow-GetUNOData();
-if ( !pUNOData )
-pUNOData = ImplSmartCreateUNOData( pNewWindow );
-
-::com::sun::star::awt::VclContainerEvent aEvent;
-aEvent.Source = (UsrObject*)pParentUNOData-GetWindowPeer();
-aEvent.Id = VCLCOMPONENT_ADDED;
-aEvent.Child = (UsrObject*)pUNOData-GetWindowPeer();
-
-EventList* pLst = pParentUNOData-GetListeners( EL_CONTAINER );
-for ( sal_uInt32 n = 0; n pLst-Count(); n++ )
-{
-::com::sun::star::uno::Reference
::com::sun::star::lang::XEventListener * pRef = pLst-GetObject( n );
-
((::com::sun::star::awt::XVclContainerListener*)(::com::sun::star::lang::XEventListener*)*pRef)-windowAdded(
aEvent );
-}
-}
-}
-*/
-
static sal_Bool lcl_ImplIsParent( Window* pParentWindow, Window*
pPossibleChild )
{
Window* pWindow = ( pPossibleChild != pParentWindow ) ? pPossibleChild :
NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/Configuration_filter.mk filter/source include/vcl oox/source vcl/source
filter/Configuration_filter.mk |4 + filter/source/config/cache/typedetection.cxx |1 filter/source/config/fragments/filters/mov__MOV.xcu | 21 + filter/source/config/fragments/internalgraphicfilters/mov_Import.xcu | 18 +++ filter/source/config/fragments/types/mov_MOV.xcu | 20 include/vcl/gfxlink.hxx |1 include/vcl/graphicfilter.hxx|4 + oox/source/export/drawingml.cxx |4 + vcl/source/filter/FilterConfigCache.cxx |4 + vcl/source/filter/graphicfilter.cxx | 23 ++ 10 files changed, 99 insertions(+), 1 deletion(-) New commits: commit c42c57e665ad65b3a270ae223f1012ac988acdd3 Author: Sushil Shinde sushil.shi...@synerzip.com Date: Tue Nov 26 19:06:48 2013 +0530 fdo#70338 : Fixed file corruption issue after save for docx. - File was giving corruption message if saved in LO. - Issue due to video file. - Attached file contain .mov which was not handled properly. - Added mov extension support in graphic filter. Reviewed on: https://gerrit.libreoffice.org/6818 Change-Id: Ia278127ddc4afcd2d5fe04e86ed6201fb28dc04f diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 347d00c..587e414 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -734,6 +734,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_drawgraphics_types.xcu, graphic_SWF \ jpg_JPEG \ met_OS2_Metafile \ +mov_MOV \ pbm_Portable_Bitmap \ pcd_Photo_CD_Base \ pcd_Photo_CD_Base16 \ @@ -764,6 +765,7 @@ $(call filter_Configuration_add_filters,fcfg_langpack,fcfg_drawgraphics_filters. GIF___Graphics_Interchange \ JPG___JPEG \ MET___OS_2_Metafile \ + mov__MOV \ PBM___Portable_Bitmap \ PCT___Mac_Pict \ PCX___Zsoft_Paintbrush \ @@ -880,6 +882,7 @@ $(call filter_Configuration_add_types,fcfg_langpack,fcfg_internalgraphics_types. gif_Graphics_Interchange \ jpg_JPEG \ met_OS2_Metafile \ +mov_MOV \ pbm_Portable_Bitmap \ pcd_Photo_CD_Base \ pcd_Photo_CD_Base16 \ @@ -947,6 +950,7 @@ $(call filter_Configuration_add_internal_filters,fcfg_langpack,fcfg_internalgrap xbm_Import \ xpm_Export \ xpm_Import \ +mov_Import \ ) # fcfg_xslt diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index d0bd8cf..dadf07e 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -220,6 +220,7 @@ int getFlatTypeRank(const OUString rType) psd_Adobe_Photoshop, png_Portable_Network_Graphic, jpg_JPEG, +mov_MOV, gif_Graphics_Interchange, bmp_MS_Windows, pcx_Zsoft_Paintbrush, diff --git a/filter/source/config/fragments/filters/mov__MOV.xcu b/filter/source/config/fragments/filters/mov__MOV.xcu new file mode 100644 index 000..eb06ad7 --- /dev/null +++ b/filter/source/config/fragments/filters/mov__MOV.xcu @@ -0,0 +1,21 @@ +!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * +-- +node oor:name=MOV - MOV oor:op=replace +prop oor:name=FlagsvalueIMPORT ALIEN/value/prop +prop oor:name=UIComponent/ +prop oor:name=FilterService/ +prop oor:name=UserDatavalue/value/prop +prop oor:name=UIName +value xml:lang=x-defaultMOV - QuickTime File Format/value +/prop +prop oor:name=FileFormatVersionvalue0/value/prop +prop oor:name=Typevaluemov_MOV/value/prop +prop oor:name=TemplateName/ +prop oor:name=DocumentServicevaluecom.sun.star.drawing.DrawingDocument/value/prop +/node diff --git a/filter/source/config/fragments/internalgraphicfilters/mov_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/mov_Import.xcu new file mode 100644 index 000..3dd2886 --- /dev/null +++ b/filter/source/config/fragments/internalgraphicfilters/mov_Import.xcu @@ -0,0 +1,18 @@ +!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * +-- +node oor:name=mov_Import oor:op=replace +prop oor:name=Typevaluemov_MOV/value/prop +prop
[Libreoffice-commits] core.git: cui/source
cui/source/options/optcolor.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit e3853a1abc9873a00478ba56b124e0a94f9896ba Author: Caolán McNamara caol...@redhat.com Date: Fri Dec 13 10:05:03 2013 + Resolves: fdo#71192 options-appearence isn't all the same color Change-Id: I8beaf1f4a1ea685af22ae0dafbff767bee98d3b4 diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index d09fd77..bf95ce8 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -598,7 +598,9 @@ void ColorConfigWindow_Impl::SetAppearance () Wallpaper const aBackWall(aBackColor); for (size_t i = 0; i != vChapters.size(); ++i) vChapters[i]-Show(aBackWall); -SetBackground(Wallpaper(rStyleSettings.GetFieldColor())); +Wallpaper aBack(rStyleSettings.GetFieldColor()); +SetBackground(aBack); +m_pGrid-SetBackground(aBack); // #104195# when the window color is the same as the text color it has to be changed Color aWinCol = rStyleSettings.GetWindowColor(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/source
cui/source/options/optcolor.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 6ec1253285ec39b31b82ba7bc7a2b0bd0f98ef7a Author: Caolán McNamara caol...@redhat.com Date: Fri Dec 13 10:05:03 2013 + Resolves: fdo#71192 options-appearence isn't all the same color Change-Id: I8beaf1f4a1ea685af22ae0dafbff767bee98d3b4 (cherry picked from commit e3853a1abc9873a00478ba56b124e0a94f9896ba) diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index d09fd77..bf95ce8 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -598,7 +598,9 @@ void ColorConfigWindow_Impl::SetAppearance () Wallpaper const aBackWall(aBackColor); for (size_t i = 0; i != vChapters.size(); ++i) vChapters[i]-Show(aBackWall); -SetBackground(Wallpaper(rStyleSettings.GetFieldColor())); +Wallpaper aBack(rStyleSettings.GetFieldColor()); +SetBackground(aBack); +m_pGrid-SetBackground(aBack); // #104195# when the window color is the same as the text color it has to be changed Color aWinCol = rStyleSettings.GetWindowColor(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bc/a5a8e8e53830c59aeb283a4fdbde8b2bb472e8
bc/a5a8e8e53830c59aeb283a4fdbde8b2bb472e8 |1 + 1 file changed, 1 insertion(+) New commits: commit 883cc86121a0d6e50dc352b02459f854d41ff59c Author: Caolán McNamara caol...@redhat.com Date: Fri Dec 13 10:07:37 2013 + Notes added by 'git notes add' diff --git a/bc/a5a8e8e53830c59aeb283a4fdbde8b2bb472e8 b/bc/a5a8e8e53830c59aeb283a4fdbde8b2bb472e8 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/bc/a5a8e8e53830c59aeb283a4fdbde8b2bb472e8 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6f/53c4f2f46691d41ccf2c2a99ae40105606e489
6f/53c4f2f46691d41ccf2c2a99ae40105606e489 |1 + 1 file changed, 1 insertion(+) New commits: commit 6c561254623955aa0fa25c6f731a6c90ee24a4cb Author: Caolán McNamara caol...@redhat.com Date: Fri Dec 13 10:12:08 2013 + Notes added by 'git notes add' diff --git a/6f/53c4f2f46691d41ccf2c2a99ae40105606e489 b/6f/53c4f2f46691d41ccf2c2a99ae40105606e489 new file mode 100644 index 000..62fd17a --- /dev/null +++ b/6f/53c4f2f46691d41ccf2c2a99ae40105606e489 @@ -0,0 +1 @@ +merged as: e9c08cfed475a61ef5612262a43eab27c96fc9bd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/accessibility/AccessibleShape.cxx | 15 +++
svx/source/table/accessibletableshape.cxx|2 +-
2 files changed, 8 insertions(+), 9 deletions(-)
New commits:
commit e9c08cfed475a61ef5612262a43eab27c96fc9bd
Author: Steve Yin stev...@apache.org
Date: Fri Dec 13 05:20:32 2013 +
fixes for issues checked out by coverity
(cherry picked from commit 6f53c4f2f46691d41ccf2c2a99ae40105606e489)
Change-Id: I76e21409fee4f39bd6f048636e4fbc392807a486
diff --git a/svx/source/accessibility/AccessibleShape.cxx
b/svx/source/accessibility/AccessibleShape.cxx
index 4da0e3f..a72ebef 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -422,18 +422,17 @@ uno::ReferenceXAccessibleRelationSet SAL_CALL
{
::osl::MutexGuard aGuard (maMutex);
::utl::AccessibleRelationSetHelper* pRelationSet = new
utl::AccessibleRelationSetHelper;
-uno::Sequence uno::Reference uno::XInterface aSequence(1);
-aSequence[0] = mpParent-GetAccessibleCaption(mxShape);
//this mxshape is the captioned shape, only for sw
-if(aSequence[0].get())
-{
-pRelationSet-AddRelation(
-AccessibleRelation( AccessibleRelationType::DESCRIBED_BY,
aSequence ) );
-}
-
if (pRelationSet != NULL)
{
+uno::Sequence uno::Reference uno::XInterface aSequence(1);
+aSequence[0] = mpParent-GetAccessibleCaption(mxShape);
+if(aSequence[0].get())
+{
+pRelationSet-AddRelation(
+AccessibleRelation( AccessibleRelationType::DESCRIBED_BY,
aSequence ) );
+}
return uno::ReferenceXAccessibleRelationSet (
new ::utl::AccessibleRelationSetHelper (*pRelationSet));
}
diff --git a/svx/source/table/accessibletableshape.cxx
b/svx/source/table/accessibletableshape.cxx
index 9d1ab93..d0cddf6 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -313,6 +313,7 @@ void SAL_CALL AccessibleTableShapeImpl::disposing( const
EventObject /*Source*/
AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo
rShapeInfo, const AccessibleShapeTreeInfo rShapeTreeInfo)
: AccessibleTableShape_Base(rShapeInfo, rShapeTreeInfo)
, mxImpl( new AccessibleTableShapeImpl( maShapeTreeInfo ) )
+, mnPreviousSelectionCount(0)
{
}
@@ -328,7 +329,6 @@ void AccessibleTableShape::Init()
{
try
{
-mnPreviousSelectionCount = 0;
Reference XPropertySet xSet( mxShape, UNO_QUERY_THROW );
Reference XTable xTable( xSet-getPropertyValue(Model),
UNO_QUERY_THROW );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: package/source sw/qa sw/source writerfilter/inc writerfilter/source
package/source/xstor/owriteablestream.cxx |4
sw/qa/extras/ooxmlexport/data/testGlossary.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx|8 +
sw/source/filter/ww8/docxexport.cxx | 76 +++
sw/source/filter/ww8/docxexport.hxx |2
writerfilter/inc/ooxml/OOXMLDocument.hxx|6 -
writerfilter/source/filter/ImportFilter.cxx |8 +
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 116
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx |6 +
writerfilter/source/ooxml/OOXMLStreamImpl.cxx |8 +
10 files changed, 229 insertions(+), 5 deletions(-)
New commits:
commit 88b9e7f391910e534b0faf7378ec4c6929d4d44a
Author: Rohit Deshmukh rohit.deshm...@synerzip.com
Date: Wed Nov 27 13:53:12 2013 +0530
fdo#71786 : Implemented Glossary folder
1. Glosary folder is imported as Intrograb and exported.
2. Added unit test case
Reviewed on:
https://gerrit.libreoffice.org/6825
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
writerfilter/source/filter/ImportFilter.cxx
Change-Id: Ifd51a75a65e030d44d30e02cd7ab51fb088186b3
diff --git a/package/source/xstor/owriteablestream.cxx
b/package/source/xstor/owriteablestream.cxx
index 9d987a5..bc7086e 100644
--- a/package/source/xstor/owriteablestream.cxx
+++ b/package/source/xstor/owriteablestream.cxx
@@ -3104,6 +3104,10 @@ void SAL_CALL OWriteStream::setPropertyValue( const
OUString aPropertyName, con
else if ( m_pData-m_nStorageType == embed::StorageFormats::PACKAGE
( aPropertyName == IsEncrypted || aPropertyName == Encrypted
) )
throw beans::PropertyVetoException(); // TODO
+else if ( aPropertyName == RelId )
+{
+aValue = m_pImpl-m_nRelId;
+}
else
throw beans::UnknownPropertyException(); // TODO
diff --git a/sw/qa/extras/ooxmlexport/data/testGlossary.docx
b/sw/qa/extras/ooxmlexport/data/testGlossary.docx
new file mode 100644
index 000..eb05758
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/testGlossary.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 7267838..a7e28cf 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2115,6 +2115,14 @@ DECLARE_OOXMLEXPORT_TEST(testcolumnbreak,
columnbreak.docx)
assertXPath(pXmlDoc, /w:document/w:body/w:p[5]/w:r[1]/w:br, type,
column);
}
+DECLARE_OOXMLEXPORT_TEST(testGlossary, testGlossary.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/glossary/document.xml);
+if (!pXmlDoc)
+return;
+assertXPath(pXmlDoc, /w:glossaryDocument, Ignorable, w14 wp14);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index 6c7a66b..2edcf56 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -64,7 +64,7 @@
#include ww8par.hxx
#include ww8scan.hxx
-
+#include oox/token/properties.hxx
#include comphelper/string.hxx
#include rtl/ustrbuf.hxx
#include vcl/font.hxx
@@ -361,6 +361,8 @@ void DocxExport::ExportDocument_Impl()
WriteTheme();
+WriteGlossary();
+
WriteCustomXml();
WriteActiveX();
@@ -831,6 +833,78 @@ void DocxExport::WriteTheme()
uno::Sequence beans::StringPair () );
}
+void DocxExport::WriteGlossary()
+{
+uno::Reference beans::XPropertySet xPropSet(
pDoc-GetDocShell()-GetBaseModel(), uno::UNO_QUERY_THROW );
+
+uno::Reference beans::XPropertySetInfo xPropSetInfo =
xPropSet-getPropertySetInfo();
+OUString pName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
+if ( !xPropSetInfo-hasPropertyByName( pName ) )
+return;
+
+uno::Referencexml::dom::XDocument glossaryDocDom;
+uno::Sequence uno::Sequence uno::Any glossaryDomList;
+uno::Sequence beans::PropertyValue propList;
+xPropSet-getPropertyValue( pName ) = propList;
+sal_Int32 collectedProperties = 0;
+for ( sal_Int32 nProp=0; nProp propList.getLength(); ++nProp )
+{
+OUString propName = propList[nProp].Name;
+if ( propName == OOXGlossary )
+{
+ propList[nProp].Value = glossaryDocDom;
+ collectedProperties++;
+}
+if (propName == OOXGlossaryDom)
+{
+propList[nProp].Value = glossaryDomList;
+collectedProperties++;
+}
+if (collectedProperties == 2)
+break;
+}
+
+// no glossary dom to write
+if ( !glossaryDocDom.is() )
+return;
+
+m_pFilter-addRelation( m_pDocumentFS-getOutputStream(),
+
http://schemas.openxmlformats.org/officeDocument/2006/relationships/glossaryDocument;,
+glossary/document.xml );
+
+uno::Reference io::XOutputStream xOutputStream =
GetFilter().openFragmentStream( word/glossary/document.xml,
+
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/graphicfilter.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 8db5c8c080f8b02bacbb1990eaec0e89f6cf8f1f
Author: Tor Lillqvist t...@collabora.com
Date: Fri Dec 13 12:16:22 2013 +0200
WaE: statement aligned ... [loplugin]
Either missing braces around the else branch, or inconsistent indentation. I
guessed it was the former and added braces.
Change-Id: Ic5e7db892774d48ba6db09a40741e5fbbdc95994
diff --git a/vcl/source/filter/graphicfilter.cxx
b/vcl/source/filter/graphicfilter.cxx
index 6c38c1b..e19f54f 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1583,9 +1583,11 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic
rGraphic, const OUString rPat
if( rIStream.GetError() )
nStatus = GRFILTER_FORMATERROR;
else
+{
rGraphic.SetDefaultType();
rIStream.Seek( STREAM_SEEK_TO_END );
eLinkType = GFX_LINK_TYPE_NATIVE_MOV;
+}
}
else if( aFilterName.equalsIgnoreAsciiCase( IMP_WMF ) ||
aFilterName.equalsIgnoreAsciiCase( IMP_EMF ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/table/accessibletableshape.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 61492fadb6fcaab384244754eb6116c9e3582079
Author: Tor Lillqvist t...@collabora.com
Date: Fri Dec 13 12:30:32 2013 +0200
WaE: field 'mxImpl' will be initialized after field
'mnPreviousSelectionCount'
Change-Id: I7d6facb76317d8e7de3adbafdf3763f37c1b0837
diff --git a/svx/source/table/accessibletableshape.cxx
b/svx/source/table/accessibletableshape.cxx
index d0cddf6..cfeb62f 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -312,8 +312,8 @@ void SAL_CALL AccessibleTableShapeImpl::disposing( const
EventObject /*Source*/
AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo
rShapeInfo, const AccessibleShapeTreeInfo rShapeTreeInfo)
: AccessibleTableShape_Base(rShapeInfo, rShapeTreeInfo)
-, mxImpl( new AccessibleTableShapeImpl( maShapeTreeInfo ) )
, mnPreviousSelectionCount(0)
+, mxImpl( new AccessibleTableShapeImpl( maShapeTreeInfo ) )
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: git-hooks/contrib
git-hooks/contrib/test-files.git/hooks/update | 35 +-
1 file changed, 29 insertions(+), 6 deletions(-)
New commits:
commit 977f96ba1c1e5857d47feaf23921d40e2c6d3ef0
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Dec 13 11:33:35 2013 +0100
git-hooks: bring test-files in sync with core
Change-Id: I5e04395dac45b34f10fc99e95e3cc111fb456447
diff --git a/git-hooks/contrib/test-files.git/hooks/update
b/git-hooks/contrib/test-files.git/hooks/update
index e58517f..9dcbb0b 100755
--- a/git-hooks/contrib/test-files.git/hooks/update
+++ b/git-hooks/contrib/test-files.git/hooks/update
@@ -14,14 +14,20 @@ if [ $(id -u -n ) != logerrit ] ; then
echo *** The reference for this repo is gerrit. do not push directly
to fdo 2
exit 1
fi
+from=$(git show -s --pretty=format:'%an %ae' $3^{})
-
-project=LibreOffice test files
+project=$(cat $GIT_DIR/description)
recipients=libreoffice-comm...@lists.freedesktop.org
-
ref_type=$(git cat-file -t $3)
+# Avoid re-introducing obsolete tags
+if grep -q ^$1$ hooks/obsolete-tags; then
+ echo *** Re-introducing an obsolete tag ($1) is not allowed in this
repo 2
+ echo *** Use corereleasebranches/killtagslocal.sh from
contrib/dev-tools.git to get rid of them. 2
+ exit 1
+fi
+
# Only allow annotated tags in a shared repo
# Remove this code to treat dumb tags the same as everything else
case $1,$ref_type in
@@ -49,8 +55,9 @@ date_format=%F %R %z
num_path_components=2
# Set subject
+repo=$(basename $(cd $GIT_DIR ; pwd))
if expr $2 : '0*$' /dev/null ; then
- subject=Changes to '${1##refs/heads/}'
+ subject=$repo: Changes to '${1##refs/heads/}'
else
base=$(git-merge-base $2 $3)
subject=$(git-diff-tree -r --name-only $base $3 |
@@ -63,6 +70,7 @@ else
if [ $branch != master ] ; then
subject=Branch '$branch' - $subject
fi
+ subject=$repo: $subject
fi
if expr $2 : '0*$' /dev/null
@@ -111,7 +119,22 @@ else
echo Rebased ref, commits from common ancestor:
;;
esac
- git-rev-list $3 ^$base | while read rev; do git-show $rev; done
+ bytes=0
+ IFS=$(echo)
+ git-rev-list $3 ^$base | while read rev; do git-show -M $rev; done
| sed 's#\\##g' |
+ while read line
+ do
+ if [ $bytes -ge 0 ] ; then
+ bytes=$(( $bytes + ${#line} + 1 ))
+ if [ $bytes -gt 10 ] ; then
+ bytes=-1
+ echo -e \n... etc. - the rest is
truncated
+ else
+ echo $line
+ fi
+ fi
+ done
fi |
-mail -s $subject -a X-Git-Repository:
git://git.cairographics.org/git/cairo $recipients
+mail -s $subject -a X-Git-Repository:
git://anongit.freedesktop.org/git/libreoffice/contrib/test-files.git \
+ -a List-Post: mailto:libreoffice@lists.freedesktop.org -a From:
$from $recipients
exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Efficient UNO component linkage GC ...
On 12/12/2013 02:47 PM, Michael Meeks wrote: To split into smaller, unconnected parts would mean to split existing component XML entities into smaller ones, each with its own prefix That would suck IMHO :-) we have enough scattered files. To be clear, this is about source files, not installation-/run-time ones. Or, as you detail below, go further and add more efficient support for the single-object-implementation factory case. (Do you have any idea whether this is worth it, given we have to continue supporting the other case for extension-compatibility anyway?) Sure it's worth it given we're primarily looking for size savings for mobile; for the Linux case we get only marginal wins here I think. I'd assume the major size savings would come from leaving out unused areas of code, and that would already be possible without the go further part. Incidentally - do we actually use the service information in anger ? ie. could we not populate / store the data required for the XServiceInfo interface from the services.rdb at run-time, rather than having it duplicated in the code ? or is there some benefit to that ? The duplication is an unfortunate consequence of the move from active to passive component registration. And as the code was already there, I never bothered too much to change that to instead re-use the .rdb data. (Which wouldn't have been easy or elegant, but that might be different if we represent the .rdb data not in an additional file read at start-up but in some compiled-in data structures). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - writerfilter/source
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit f658b7dfd6d23e4a179917245d6e6d4653d6678e
Author: Tor Lillqvist t...@collabora.com
Date: Fri Dec 13 12:37:37 2013 +0200
WaE: unused variable 'sStylesWithEffects' [loplugin]
Change-Id: Id9b3d81482104e9e78b986c9a78704b01cd0fba2
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index ecd55f0..92a4057 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -529,7 +529,6 @@ void OOXMLDocumentImpl::resolveCustomXmlStream(Stream
rStream)
void OOXMLDocumentImpl::resolveGlossaryStream(Stream /*rStream*/)
{
static OUString
sSettingsType(http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings;);
-static OUString
sStylesWithEffects(http://schemas.microsoft.com/office/2007/relationships/stylesWithEffects;);
static OUString
sStylesType(http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles;);
static OUString
sFonttableType(http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable;);
static OUString
sWebSettings(http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings;);
commit 654f3902b5005df60622e031885dfaa8ca150b63
Author: Tor Lillqvist t...@collabora.com
Date: Fri Dec 13 12:37:06 2013 +0200
Use proper logging tag
Change-Id: I5fcac443a0b243814a8e5d3075ed4b484e977bec
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 2f5f280..ecd55f0 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -605,7 +605,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream
/*rStream*/)
}
catch (uno::Exception const e)
{
- SAL_INFO(writerfilter glossary grab bag,
importSubStream: exception while
+ SAL_INFO(writerfilter, importSubStream: exception
while
parsing stream of Type nType : e.Message);
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Efficient UNO component linkage GC ...
On Fri, 2013-12-13 at 11:36 +0100, Stephan Bergmann wrote: To be clear, this is about source files, not installation-/run-time ones. Sure - but even so - there are a lot of components ;-) xmllint --format services.rdb | grep 'implementation' | wc -l 1019 git ls-files | grep '\.component' | wc -l 270 I'd prefer not to add (and maintain) another 700 tiny files to git that are mostly headers; or did I miss the suggestion ? I guess until we have mergedlibs on Windows, we can't easily dispense with the .component files for internal components and just build an internal data-structure. Even if we did, I imagine compiling / generating that from .component files might be more interesting elegant anyway. Or, as you detail below, go further and add more efficient support for the single-object-implementation factory case. (Do you have any idea whether this is worth it, given we have to continue supporting the other case for extension-compatibility anyway?) Sure it's worth it given we're primarily looking for size savings for mobile; for the Linux case we get only marginal wins here I think. I'd assume the major size savings would come from leaving out unused areas of code, and that would already be possible without the go further part. True - but while we're here - AFAICS we should go further to clean that up make it more efficient =) it's a golden opportunity I think. The duplication is an unfortunate consequence of the move from active to passive component registration. And as the code was already there, I never bothered too much to change that to instead re-use the .rdb data. (Which wouldn't have been easy or elegant, but that might be different if we represent the .rdb data not in an additional file read at start-up but in some compiled-in data structures). Yes - it's a great idea. I love it as an iteration - not least because it should/could kill all that horrible native-code.cxx duplication =) Then again it's quite nice to be able to build multiple binaries with different component sets included from the tree - so I guess having some form of run-time registration of some nice const static component descriptions would be cool. Anyhow - looking forward to what Matus comes up with =) Regards, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/fdo71785.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |5 +
sw/source/filter/ww8/docxtablestyleexport.cxx | 20 ++--
3 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit 0f6240fa92c443f66441545438821c02b3412486
Author: YogeshBharate yogesh.bhar...@synerzip.com
Date: Fri Nov 29 18:02:54 2013 +0530
fdo#71785: File hangs LibreOffice on Save
Problem Description: While saving the file LO shows the error
This file could not be save.
The root cause was memory leak.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/6850
Change-Id: Iacc185780c14760056a7d690eb113d4dde1de034
diff --git a/sw/qa/extras/ooxmlexport/data/fdo71785.docx
b/sw/qa/extras/ooxmlexport/data/fdo71785.docx
new file mode 100644
index 000..e155e83
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo71785.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index a7e28cf..d594627 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2123,6 +2123,11 @@ DECLARE_OOXMLEXPORT_TEST(testGlossary,
testGlossary.docx)
assertXPath(pXmlDoc, /w:glossaryDocument, Ignorable, w14 wp14);
}
+DECLARE_OOXMLEXPORT_TEST(testFdo71785, fdo71785.docx)
+{
+// crashtest
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx
b/sw/source/filter/ww8/docxtablestyleexport.cxx
index fb1ddbd..255791c 100644
--- a/sw/source/filter/ww8/docxtablestyleexport.cxx
+++ b/sw/source/filter/ww8/docxtablestyleexport.cxx
@@ -345,7 +345,8 @@ void
DocxTableStyleExport::Impl::tableStyleRPr(uno::Sequencebeans::PropertyValu
m_pSerializer-startElementNS(XML_w, XML_rPr, FSEND);
-uno::Sequencebeans::PropertyValue aRFonts, aLang, aColor;
+uno::Sequencebeans::PropertyValue aRFonts, aLang, aColor,
aSpacingSequence;
+bool bSequenceFlag = false ;
OUString aB, aBCs, aI, aSz, aSzCs, aCaps, aSmallCaps, aSpacing;
for (sal_Int32 i = 0; i rRPr.getLength(); ++i)
{
@@ -370,7 +371,16 @@ void
DocxTableStyleExport::Impl::tableStyleRPr(uno::Sequencebeans::PropertyValu
else if (rRPr[i].Name == smallCaps)
aSmallCaps = rRPr[i].Value.getOUString();
else if (rRPr[i].Name == spacing)
-aSpacing = rRPr[i].Value.getOUString();
+{
+if (rRPr[i].Value.hasOUString())
+{
+aSpacing = rRPr[i].Value.getOUString();
+}
+else {
+aSpacingSequence = rRPr[i].Value.get
uno::Sequencebeans::PropertyValue () ;
+bSequenceFlag = true ; // set the uno::Sequence flag.
+}
+}
}
tableStyleRRFonts(aRFonts);
tableStyleRLang(aLang);
@@ -380,6 +390,12 @@ void
DocxTableStyleExport::Impl::tableStyleRPr(uno::Sequencebeans::PropertyValu
handleBoolean(aCaps, XML_caps);
handleBoolean(aSmallCaps, XML_smallCaps);
tableStyleRColor(aColor);
+if(bSequenceFlag)
+{
+ m_pSerializer-singleElementNS(XML_w, XML_spacing,
+FSNS(XML_w,
XML_val),OUStringToOString(aSpacingSequence[0].Value.getOUString(),
RTL_TEXTENCODING_UTF8).getStr(),
+ FSEND);
+}
if (!aSpacing.isEmpty())
m_pSerializer-singleElementNS(XML_w, XML_spacing,
FSNS(XML_w, XML_val), OUStringToOString(aSpacing,
RTL_TEXTENCODING_UTF8).getStr(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart-opengl' - 2 commits - chart2/Library_chartopengl.mk chart2/source include/svx svx/source
chart2/Library_chartopengl.mk |1 +
chart2/source/view/main/DrawModelWrapper.cxx |4 +++-
chart2/source/view/main/OpenglShapeFactory.cxx |6 --
include/svx/unoshape.hxx | 23 +++
svx/source/unodraw/unoshap4.cxx|8
5 files changed, 39 insertions(+), 3 deletions(-)
New commits:
commit bad134e6bf98bf851ccbc6cf9ef857f6ad8ced2c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Dec 13 12:09:29 2013 +0100
disable this call for now
That one is particular nasty because it creates the chart root shape
before the chart view exists and deletes therefore the uno object
directly.
Change-Id: Idb2318484bac4c2f251f0c51e53b3add3923414c
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx
b/chart2/source/view/main/DrawModelWrapper.cxx
index dedf65e..48f2bb7 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -235,7 +235,9 @@ uno::Reference drawing::XDrawPage
DrawModelWrapper::getMainDrawPage()
}
}
//ensure that additional shapes are in front of the chart objects so
create the chart root before
-
AbstractShapeFactory::getOrCreateShapeFactory(this-getShapeFactory())-getOrCreateChartRootShape(
m_xMainDrawPage );
+// let us disable this call for now
+// TODO:moggi
+//
AbstractShapeFactory::getOrCreateShapeFactory(this-getShapeFactory())-getOrCreateChartRootShape(
m_xMainDrawPage );
return m_xMainDrawPage;
}
uno::Reference drawing::XDrawPage DrawModelWrapper::getHiddenDrawPage()
commit a413f04926f1c5d88f80f54381f933e110c72ab0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Dec 13 12:05:19 2013 +0100
add ugly hack to work around SvxDrawPage::add only accepting SvxShape
Change-Id: I77c292b088a1a1797fba10cc514167a1f3dca917
diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
index 220012e..2532fc3 100644
--- a/chart2/Library_chartopengl.mk
+++ b/chart2/Library_chartopengl.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_libraries,chartopengl,\
cppu \
cppuhelper \
sal \
+ svxcore \
vcl \
$(gb_UWINAPI) \
))
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx
b/chart2/source/view/main/OpenglShapeFactory.cxx
index 8e529b8..dc0f776 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -46,6 +46,7 @@
#include rtl/math.hxx
#include svx/svdocirc.hxx
#include svx/svdopath.hxx
+#include svx/unoshape.hxx
#include basegfx/point/b2dpoint.hxx
#include basegfx/matrix/b3dhommatrix.hxx
@@ -95,7 +96,7 @@ uno::Reference drawing::XShapes getChartShape(
xProp-getPropertyValue( UNO_NAME_MISC_OBJ_NAME ) = aRet;
if( aRet.equals(com.sun.star.chart2.shapes) )
{
-xRet = uno::Reference drawing::XShapes ( xShape,
uno::UNO_QUERY );
+xRet =
dynamic_castSvxDummyShapeContainer*(xShape.get())-getWrappedShape();
break;
}
}
@@ -119,12 +120,13 @@ uno::Reference drawing::XShapes
OpenglShapeFactory::getOrCreateChartRootShape
com.sun.star.drawing.GraphicObjectShape ), uno::UNO_QUERY );
dummy::DummyChart *pChart = new dummy::DummyChart(xTarget);
m_pChart = (void *)pChart;
+SvxDummyShapeContainer* pContainer = new
SvxDummyShapeContainer(pChart);
xRet = pChart;
#if 0
xRet = new dummy::DummyChart();
m_pChart = (void *)((dummy::DummyChart *)xRet);
#endif
-xDrawPage-add(uno::Reference drawing::XShape (xRet,
uno::UNO_QUERY_THROW));
+xDrawPage-add(pContainer);
}
return xRet;
}
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 23cbf88..bcfcf43 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -863,6 +863,29 @@ protected:
virtual bool getPropertyValueImpl( const OUString rName, const
SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any rValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
};
+/*
+ * This is a really ugly hack for the chart2 OpenGL backend
+ * SvxShapeGroup::add only accepts objects derived from SvxShape and silently
drops
+ * other objects. This fixes my life time problems but I will burn for it in
hell.
+ *
+ * The object does nothing and should not be painted. It is just there to
ensure that the
+ * wrapped object is not deleted prematurely.
+ */
+class SVX_DLLPUBLIC SvxDummyShapeContainer : public SvxShape
+{
+private:
+com::sun::star::uno::Reference com::sun::star::drawing::XShapes
+m_xDummyObject;
+
+public:
+SvxDummyShapeContainer( com::sun::star::uno::Reference
[Libreoffice-commits] core.git: include/cppuhelper
include/cppuhelper/shlib.hxx | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) New commits: commit 5ee74052edd7e83318a51ee0297607773b451a98 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Dec 13 12:37:32 2013 +0100 Clarify cppuhelper/shlib.hxx should never have gone into URE interface Change-Id: I44415f976a47bf676ab8c2f309590eb2c8afb6ce diff --git a/include/cppuhelper/shlib.hxx b/include/cppuhelper/shlib.hxx index d5d2058..0dc5705 100644 --- a/include/cppuhelper/shlib.hxx +++ b/include/cppuhelper/shlib.hxx @@ -33,6 +33,10 @@ namespace cppu fully qualified libname or single lib name. The libname need not be pre/postfixed (e.g. xxx.dll). +@deprecated +This should never have been put into the URE interface. Do not call it from +client code. + @param uri URI of the library @param rPath deprecated, must be empty @param rImplName implementation to be retrieved from the library @@ -55,6 +59,10 @@ SAL_CALL loadSharedLibComponentFactory( (e.g. xxx.dll). An optional 'prefix' parameter is used to determine the symbol name of the entry point in the library. +@deprecated +This should never have been put into the URE interface. Do not call it from +client code. + @param uri URI of the library @param rPath deprecated, must be empty @param rImplName implementation to be retrieved from the library @@ -64,6 +72,8 @@ SAL_CALL loadSharedLibComponentFactory( @return factory instance (com::sun::star::lang::XSingleComponentFactory or legacy com::sun::star::lang::XSingleServiceFactory) + +@since LibreOffice 3.4 */ CPPUHELPER_DLLPUBLIC ::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface SAL_CALL loadSharedLibComponentFactory( @@ -78,7 +88,10 @@ SAL_CALL loadSharedLibComponentFactory( a fully qualified libname or single lib name. The libname need not be pre/postfixed (e.g. xxx.dll). -@deprecated component_writeInfo should no longer be used in new components +@deprecated +This should never have been put into the URE interface. Do not call it from +client code. Also, this functionality is not needed for passively +registered components, only for actively registered legacy ones. @param uri URI of the library @param rPath deprecated, must be empty ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source include/filter include/oox oox/source sw/source
filter/source/msfilter/escherex.cxx | 11 +++
filter/source/msfilter/eschesdo.cxx | 14 +++---
filter/source/msfilter/eschesdo.hxx |4 ++--
include/filter/msfilter/escherex.hxx |8 +---
include/oox/export/vmlexport.hxx |2 +-
oox/source/export/vmlexport.cxx |4 ++--
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
7 files changed, 25 insertions(+), 20 deletions(-)
New commits:
commit 8fe352be80ff69552f622f3c7a6a6f269912ab71
Author: Nikhil Walvekar nikhil.walve...@synerzip.com
Date: Fri Nov 29 14:03:46 2013 +0530
fdo#65836 Do not compress WMF / EMF file incase of OOXML export
Change-Id: Ic498e5703ab48719f998be6da3f245843cc0979d
Reviewed-on: https://gerrit.libreoffice.org/6849
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 4f94859..1f41f2b 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1429,7 +1429,7 @@ sal_Bool
EscherPropertyContainer::CreateEmbeddedHatchProperties( const ::com::su
sal_Bool EscherPropertyContainer::CreateGraphicProperties(
const ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet,
const OUString rSource, const sal_Bool bCreateFillBitmap, const
sal_Bool bCreateCroppingAttributes,
-const sal_Bool bFillBitmapModeAllowed )
+const sal_Bool bFillBitmapModeAllowed, const sal_Bool bOOxmlExport
)
{
sal_BoolbRetValue = sal_False;
sal_BoolbCreateFillStyles = sal_False;
@@ -1743,7 +1743,7 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
SvMemoryStream aMemStrm;
Rectangle aRect;
-if ( aProvider.GetBlibID( aMemStrm, aUniqueId, aRect,
NULL, pGraphicAttr ) )
+if ( aProvider.GetBlibID( aMemStrm, aUniqueId, aRect,
NULL, pGraphicAttr, bOOxmlExport ) )
{
// grab BLIP from stream and insert directly as
complex property
// ownership of stream memory goes to complex property
@@ -4231,7 +4231,8 @@ sal_Bool EscherGraphicProvider::GetPrefSize( const
sal_uInt32 nBlibId, Size rPr
}
sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream rPicOutStrm, const
OString rId,
-const Rectangle /* rBoundRect */,
const com::sun::star::awt::Rectangle* pVisArea, const GraphicAttr* pGraphicAttr
)
+const Rectangle /* rBoundRect */,
const com::sun::star::awt::Rectangle* pVisArea,
+const GraphicAttr* pGraphicAttr,
const sal_Bool bOOxmlExport )
{
sal_uInt32 nBlibId = 0;
GraphicObject aGraphicObject( rId );
@@ -4367,7 +4368,9 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream
rPicOutStrm, const OStrin
else if ( eBlibType == PEG )
rPicOutStrm (sal_uInt16)0x0505;
}
-if ( ( eBlibType == PEG ) || ( eBlibType == PNG ) )
+// #69607 do not compress WMF files if we are in OOXML export
+if ( ( eBlibType == PEG ) || ( eBlibType == PNG ) ||
+( ( ( eBlibType == WMF ) || ( eBlibType == EMF ) )
bOOxmlExport ) )
{
nExtra = 17;
p_EscherBlibEntry-mnSizeExtra = nExtra + 8;
diff --git a/filter/source/msfilter/eschesdo.cxx
b/filter/source/msfilter/eschesdo.cxx
index ca78c69..16311df 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -173,7 +173,7 @@ void ImplEESdrWriter::MapRect(ImplEESdrObject /* rObj */ )
sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject rObj,
EscherSolverContainer rSolverContainer,
-ImplEESdrPageType ePageType )
+ImplEESdrPageType ePageType, const sal_Bool
bOOxmlExport )
{
sal_uInt32 nShapeID = 0;
sal_uInt16 nShapeType = 0;
@@ -209,7 +209,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape(
ImplEESdrObject rObj,
ImplEESdrObject aObj( *this, *(Reference XShape *)
xXIndexAccess-getByIndex( n ).getValue()
);
if( aObj.IsValid() )
-ImplWriteShape( aObj, rSolverContainer, ePageType );
+ImplWriteShape( aObj, rSolverContainer, ePageType,
bOOxmlExport );
}
mpEscherEx-LeaveGroup();
}
@@ -551,7 +551,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape(
ImplEESdrObject rObj,
else
{
ADD_SHAPE( ESCHER_ShpInst_PictureFrame, 0xa00 );
-
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/escherex.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 15b737c5c9230f145ff5dc6c8eee2abaefe36081
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Dec 13 12:50:42 2013 +0100
EscherGraphicProvider::GetBlibID: raw number is Sun bugtracker, use fdo
prefix
Change-Id: I1ecd3b9c74fb973769036defba96d73c5995175f
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 1f41f2b..0bd10ac 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4368,7 +4368,7 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream
rPicOutStrm, const OStrin
else if ( eBlibType == PEG )
rPicOutStrm (sal_uInt16)0x0505;
}
-// #69607 do not compress WMF files if we are in OOXML export
+// fdo#69607 do not compress WMF files if we are in OOXML export
if ( ( eBlibType == PEG ) || ( eBlibType == PNG ) ||
( ( ( eBlibType == WMF ) || ( eBlibType == EMF ) )
bOOxmlExport ) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Efficient UNO component linkage GC ...
On 12/13/2013 12:02 PM, Michael Meeks wrote: On Fri, 2013-12-13 at 11:36 +0100, Stephan Bergmann wrote: To be clear, this is about source files, not installation-/run-time ones. Sure - but even so - there are a lot of components ;-) xmllint --format services.rdb | grep 'implementation' | wc -l 1019 git ls-files | grep '\.component' | wc -l 270 I'd prefer not to add (and maintain) another 700 tiny files to git that are mostly headers; or did I miss the suggestion ? Sure. And I'm not saying at all we shouldn't move ahead, just wanted to clarify build vs. runtime here. I guess until we have mergedlibs on Windows, we can't easily dispense with the .component files for internal components and just build an internal data-structure. Even if we did, I imagine compiling / generating that from .component files might be more interesting elegant anyway. Probably depends on how most elegantly to share the per-service-impl info needed by both the service mgr and the impl's XServiceInfo. True - but while we're here - AFAICS we should go further to clean that up make it more efficient =) it's a golden opportunity I think. Btw, we have rather good conditions there wrt not having to care about compatibility too much: Extension components are restricted to legacy active registration (covered by DllComponentLoader calling cppu::loadSharedLibComponentFactory w/o prefix) and to the original components XML schema (sans prefix attribute) for passive registration. That's all we need to keep stable. Nowadays, the only code involved for passively registered components are cppuhelper/source/servicemanager.cxx reading the .rdb data and passing off instantiation requests to cppuhelper/source/shlib.cxx. For historical reasons they do so via a published additional cppu::loadSharedLibComponentFactory overload (with additional prefix argument), but that communication channel should rather be private. That is, we can easily extend the components XML schema, even removing features again in a later LO version. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 11 commits - cui/source cui/uiconfig icon-themes/galaxy include/sfx2 officecfg/registry sfx2/Library_sfx.mk sfx2/source sfx2/uiconfig
cui/source/options/optjava.cxx |3
cui/uiconfig/ui/optadvancedpage.ui |5 +
icon-themes/galaxy/res/base128.png |binary
icon-themes/galaxy/res/calc128.png |binary
icon-themes/galaxy/res/draw128.png |binary
icon-themes/galaxy/res/impress128.png |binary
icon-themes/galaxy/res/main128.png |binary
icon-themes/galaxy/res/math128.png |binary
icon-themes/galaxy/res/writer128.png |binary
include/sfx2/recentdocsviewitem.hxx|3
include/sfx2/thumbnailviewitem.hxx |3
officecfg/registry/schema/org/openoffice/Office/Common.xcs |7 +
sfx2/Library_sfx.mk|1
sfx2/source/appl/sfx.src | 14 +--
sfx2/source/control/recentdocsview.cxx |2
sfx2/source/control/recentdocsviewitem.cxx | 49 ++---
sfx2/source/control/templateabstractview.cxx | 30 ++-
sfx2/source/control/thumbnailview.cxx | 37 ++---
sfx2/source/control/thumbnailviewitem.cxx | 22 +
sfx2/uiconfig/ui/startcenter.ui| 32
20 files changed, 135 insertions(+), 73 deletions(-)
New commits:
commit dd7a3f5fb873b77da326eb8339c2ef9e3bf4fbd1
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Dec 13 13:00:13 2013 +0100
startcenter: Tooltip should show the full URL.
Change-Id: Ia8e071ebe00fb8c72973614077e778aef55fb1ab
diff --git a/include/sfx2/recentdocsviewitem.hxx
b/include/sfx2/recentdocsviewitem.hxx
index 4442e32..be94b78 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -19,6 +19,9 @@ public:
const OUString rTitle, sal_uInt16 nId);
virtual void setEditTitle (bool edit, bool bChangeFocus = true);
+/// Text to be used for the tooltip.
+virtual OUString getHelpText() const;
+
OUString maURL;
};
diff --git a/include/sfx2/thumbnailviewitem.hxx
b/include/sfx2/thumbnailviewitem.hxx
index e36f565..eea0e45 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -89,6 +89,9 @@ public:
void setHighlight (bool state);
+/// Text to be used for the tooltip.
+virtual OUString getHelpText() const;
+
virtual void setEditTitle (bool edit, bool bChangeFocus = true);
void updateTitleEditSize ();
virtual void setTitle (const OUString rTitle);
diff --git a/sfx2/source/control/recentdocsviewitem.cxx
b/sfx2/source/control/recentdocsviewitem.cxx
index 570e782..2531da1 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -69,4 +69,9 @@ void RecentDocsViewItem::setEditTitle (bool edit, bool
bChangeFocus)
(void)bChangeFocus;
}
+OUString RecentDocsViewItem::getHelpText() const
+{
+return maURL;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 137aeb0..695447e 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -96,7 +96,7 @@ void ThumbnailView::MouseMove(const MouseEvent rMEvt)
if (pItem-mbVisible !rMEvt.IsLeaveWindow()
pItem-getDrawArea().IsInside(aPoint))
{
-aHelp = pItem-maTitle;
+aHelp = pItem-getHelpText();
if (!pItem-isHighlighted())
bNeedsPaint = true;
diff --git a/sfx2/source/control/thumbnailviewitem.cxx
b/sfx2/source/control/thumbnailviewitem.cxx
index 6198f45..9f60f37 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -146,6 +146,11 @@ void ThumbnailViewItem::setHighlight (bool state)
mbHover = state;
}
+OUString ThumbnailViewItem::getHelpText() const
+{
+return maTitle;
+}
+
void ThumbnailViewItem::setEditTitle (bool edit, bool bChangeFocus)
{
mbEditTitle = edit;
commit f655b23d57f234c0e92255302353f2a0a3fad487
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Dec 13 11:35:57 2013 +0100
startcenter: Implement mouse over effect.
Change-Id: I9beea6119dbb1c12ff053e5776f15d40a3389a8b
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 8c6a961..137aeb0 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -83,27 +83,38 @@ ThumbnailView::~ThumbnailView()
ImplDeleteItems();
}
-void ThumbnailView::MouseMove( const MouseEvent rMEvt )
+void ThumbnailView::MouseMove(const MouseEvent rMEvt)
{
-if ( !mbShowTooltips )
-return;
-
-(void) rMEvt; // unused parameter
-size_t nItemCount =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 8 commits - icon-themes/galaxy include/sfx2 sfx2/Library_sfx.mk sfx2/source
icon-themes/galaxy/res/base128.png |binary
icon-themes/galaxy/res/calc128.png |binary
icon-themes/galaxy/res/draw128.png |binary
icon-themes/galaxy/res/impress128.png|binary
icon-themes/galaxy/res/main128.png |binary
icon-themes/galaxy/res/math128.png |binary
icon-themes/galaxy/res/writer128.png |binary
include/sfx2/recentdocsviewitem.hxx |3 +
include/sfx2/thumbnailviewitem.hxx |3 +
sfx2/Library_sfx.mk |1
sfx2/source/appl/sfx.src | 14 +++
sfx2/source/control/recentdocsview.cxx |2 -
sfx2/source/control/recentdocsviewitem.cxx | 49 ---
sfx2/source/control/templateabstractview.cxx | 30
sfx2/source/control/thumbnailview.cxx| 37 +---
sfx2/source/control/thumbnailviewitem.cxx| 22 ++--
16 files changed, 105 insertions(+), 56 deletions(-)
New commits:
commit 3943b59c17f6fd8988b4d8c7aebd662ce387a6d6
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Dec 13 13:00:13 2013 +0100
startcenter: Tooltip should show the full URL.
Change-Id: Ia8e071ebe00fb8c72973614077e778aef55fb1ab
diff --git a/include/sfx2/recentdocsviewitem.hxx
b/include/sfx2/recentdocsviewitem.hxx
index 4442e32..be94b78 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -19,6 +19,9 @@ public:
const OUString rTitle, sal_uInt16 nId);
virtual void setEditTitle (bool edit, bool bChangeFocus = true);
+/// Text to be used for the tooltip.
+virtual OUString getHelpText() const;
+
OUString maURL;
};
diff --git a/include/sfx2/thumbnailviewitem.hxx
b/include/sfx2/thumbnailviewitem.hxx
index 6c42bdc..b4c62c7 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -89,6 +89,9 @@ public:
void setHighlight (bool state);
+/// Text to be used for the tooltip.
+virtual OUString getHelpText() const;
+
virtual void setEditTitle (bool edit, bool bChangeFocus = true);
void updateTitleEditSize ();
virtual void setTitle (const OUString rTitle);
diff --git a/sfx2/source/control/recentdocsviewitem.cxx
b/sfx2/source/control/recentdocsviewitem.cxx
index 570e782..2531da1 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -69,4 +69,9 @@ void RecentDocsViewItem::setEditTitle (bool edit, bool
bChangeFocus)
(void)bChangeFocus;
}
+OUString RecentDocsViewItem::getHelpText() const
+{
+return maURL;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 6886fac..4942150 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -96,7 +96,7 @@ void ThumbnailView::MouseMove(const MouseEvent rMEvt)
if (pItem-mbVisible !rMEvt.IsLeaveWindow()
pItem-getDrawArea().IsInside(aPoint))
{
-aHelp = pItem-maTitle;
+aHelp = pItem-getHelpText();
if (!pItem-isHighlighted())
bNeedsPaint = true;
diff --git a/sfx2/source/control/thumbnailviewitem.cxx
b/sfx2/source/control/thumbnailviewitem.cxx
index 097aae7..7fdf428 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -146,6 +146,11 @@ void ThumbnailViewItem::setHighlight (bool state)
mbHover = state;
}
+OUString ThumbnailViewItem::getHelpText() const
+{
+return maTitle;
+}
+
void ThumbnailViewItem::setEditTitle (bool edit, bool bChangeFocus)
{
mbEditTitle = edit;
commit cb144fefc4910414b95ca2fcbb90b5863e2fc996
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Dec 13 11:35:57 2013 +0100
startcenter: Implement mouse over effect.
Change-Id: I9beea6119dbb1c12ff053e5776f15d40a3389a8b
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 592c8b6..6886fac 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -83,27 +83,38 @@ ThumbnailView::~ThumbnailView()
ImplDeleteItems();
}
-void ThumbnailView::MouseMove( const MouseEvent rMEvt )
+void ThumbnailView::MouseMove(const MouseEvent rMEvt)
{
-if ( !mbShowTooltips )
-return;
-
-(void) rMEvt; // unused parameter
-size_t nItemCount = mFilteredItemList.size();
-Point aPoint = GetPointerState().maPos;
-OUStringaHelp;
+size_t nItemCount = mFilteredItemList.size();
+Point aPoint = GetPointerState().maPos;
+OUString aHelp;
-for ( size_t i = 0; i nItemCount; i++ )
+for (size_t i = 0; i nItemCount; i++)
{
+bool bNeedsPaint = false;
ThumbnailViewItem *pItem = mFilteredItemList[i];
-if ( pItem-mbVisible pItem-getDrawArea().IsInside(aPoint) )
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin
solenv/bin/modules/installer/download.pm | 78 +--
1 file changed, 44 insertions(+), 34 deletions(-)
New commits:
commit 80830a5bcbfd006c72cfcb57ce6bca0758db76b9
Author: Andre Fischer a...@apache.org
Date: Fri Dec 13 12:02:58 2013 +
123531: Cleanup: use strict, no hard-coded values.
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 8c540fa..de73339 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -32,6 +32,8 @@ use installer::pathanalyzer;
use installer::remover;
use installer::systemactions;
+use strict;
+
BEGIN { # This is needed so that cygwin's perl evaluates ACLs
# (needed for correctly evaluating the -x test.)
if( $^O =~ /cygwin/i ) {
@@ -157,7 +159,7 @@ sub call_md5sum
{
my ($filename) = @_;
-$md5sumfile = /usr/bin/md5sum;
+my $md5sumfile = /usr/bin/md5sum;
if ( ! -f $md5sumfile ) { installer::exiter::exit_program(ERROR: No file
/usr/bin/md5sum, call_md5sum); }
@@ -191,7 +193,7 @@ sub call_md5sum
sub get_md5sum
{
-($md5sumoutput) = @_;
+my ($md5sumoutput) = @_;
my $md5sum;
@@ -357,7 +359,7 @@ sub create_tar_gz_file_from_package
}
$alldirs = installer::systemactions::get_all_directories($installdir);
-$packagename = ${$alldirs}[0]; # only taking the first Solaris package
+my $packagename = ${$alldirs}[0]; # only taking the first Solaris package
if ( $packagename eq ) { installer::exiter::exit_program(ERROR: Could
not find package in directory $installdir!, determine_packagename); }
installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$packagename);
@@ -368,8 +370,8 @@ sub create_tar_gz_file_from_package
my $ldpreloadstring = ;
if ( $getuidlibrary ne ) { $ldpreloadstring = LD_PRELOAD= .
$getuidlibrary; }
-$systemcall = cd $installdir; $ldpreloadstring tar -cf - $packagename |
gzip $targzname;
-print ... $systemcall ...\n;
+my $systemcall = cd $installdir; $ldpreloadstring tar -cf - $packagename
| gzip $targzname;
+$installer::logger::Info-printf(... %s ...\n, $systemcall);
my $returnvalue = system($systemcall);
@@ -799,7 +801,7 @@ sub create_tar_gz_file_from_directory
$installer::globals::downloadfilename = $downloadfilename .
$installer::globals::downloadfileextension;
my $targzname = $downloaddir . $installer::globals::separator .
$installer::globals::downloadfilename;
-$systemcall = cd $changedir; $ldpreloadstring tar -cf - $packdir | gzip
$targzname;
+my $systemcall = cd $changedir; $ldpreloadstring tar -cf - $packdir |
gzip $targzname;
my $returnvalue = system($systemcall);
@@ -827,16 +829,13 @@ sub resolve_variables_in_downloadname
# Typical name: soa-{productversion}-{extension}-bin-{os}-{languages}
-my $productversion = ;
-if ( $allvariables-{'PRODUCTVERSION'} ) { $productversion =
$allvariables-{'PRODUCTVERSION'}; }
+my $productversion = $allvariables-{'PRODUCTVERSION'} // ;
$downloadname =~ s/\{productversion\}/$productversion/;
-my $ppackageversion = ;
-if ( $allvariables-{'PACKAGEVERSION'} ) { $packageversion =
$allvariables-{'PACKAGEVERSION'}; }
+my $packageversion = $allvariables-{'PACKAGEVERSION'} // ;
$downloadname =~ s/\{packageversion\}/$packageversion/;
-my $extension = ;
-if ( $allvariables-{'SHORT_PRODUCTEXTENSION'} ) { $extension =
$allvariables-{'SHORT_PRODUCTEXTENSION'}; }
+my $extension = $allvariables-{'SHORT_PRODUCTEXTENSION'} // ;
$extension = lc($extension);
$downloadname =~ s/\{extension\}/$extension/;
@@ -1046,11 +1045,11 @@ sub put_setup_ico_into_template
# Windows: Including the publisher into nsi template
##
-sub put_publisher_into_template
+sub put_publisher_into_template ($$)
{
-my ($templatefile) = @_;
+my ($templatefile, $variables) = @_;
-my $publisher = Sun Microsystems, Inc.;
+my $publisher = $variables-{'OOOVENDOR'} // ;
replace_one_variable($templatefile, PUBLISHERPLACEHOLDER, $publisher);
}
@@ -1059,11 +1058,11 @@ sub put_publisher_into_template
# Windows: Including the web site into nsi template
##
-sub put_website_into_template
+sub put_website_into_template ($$)
{
-my ($templatefile) = @_;
+my ($templatefile, $variables) = @_;
-my $website = http\:\/\/www\.openoffice\.org;
+my $website = $variables-{'STARTCENTER_INFO_URL'} // ;
replace_one_variable($templatefile, WEBSITEPLACEHOLDER, $website);
}
@@ -1506,7 +1505,8 @@ sub convert_utf16_to_utf8
# open( IN, :utf16, $filename ) ||
installer::exiter::exit_program(ERROR: Cannot open file $filename for
reading, convert_utf16_to_utf8);
# open( IN, :para:crlf:uni, $filename ) ||
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 80/830a5bcbfd006c72cfcb57ce6bca0758db76b9
80/830a5bcbfd006c72cfcb57ce6bca0758db76b9 |1 + 1 file changed, 1 insertion(+) New commits: commit ad2e2b3cc8f27278dd7c0ae6ac5b8193698935aa Author: Caolán McNamara caol...@redhat.com Date: Fri Dec 13 12:18:28 2013 + Notes added by 'git notes add' diff --git a/80/830a5bcbfd006c72cfcb57ce6bca0758db76b9 b/80/830a5bcbfd006c72cfcb57ce6bca0758db76b9 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/80/830a5bcbfd006c72cfcb57ce6bca0758db76b9 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/accessibility/AccessibleShape.cxx | 20 ++--
1 file changed, 6 insertions(+), 14 deletions(-)
New commits:
commit 0b9644e2443879e825fc72d5faf55080888a91b8
Author: Caolán McNamara caol...@redhat.com
Date: Fri Dec 13 10:15:15 2013 +
this NULL check, leak and copy ctor all look a bit addled
Change-Id: I5a4f80e1f6b4cc834c921d4c4780989c90cbefe2
diff --git a/svx/source/accessibility/AccessibleShape.cxx
b/svx/source/accessibility/AccessibleShape.cxx
index a72ebef..d75864f 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -424,22 +424,14 @@ uno::ReferenceXAccessibleRelationSet SAL_CALL
::utl::AccessibleRelationSetHelper* pRelationSet = new
utl::AccessibleRelationSetHelper;
//this mxshape is the captioned shape, only for sw
-if (pRelationSet != NULL)
+uno::Sequence uno::Reference uno::XInterface aSequence(1);
+aSequence[0] = mpParent-GetAccessibleCaption(mxShape);
+if(aSequence[0].get())
{
-uno::Sequence uno::Reference uno::XInterface aSequence(1);
-aSequence[0] = mpParent-GetAccessibleCaption(mxShape);
-if(aSequence[0].get())
-{
-pRelationSet-AddRelation(
-AccessibleRelation( AccessibleRelationType::DESCRIBED_BY,
aSequence ) );
-}
-return uno::ReferenceXAccessibleRelationSet (
-new ::utl::AccessibleRelationSetHelper (*pRelationSet));
-}
-else
-{
-return uno::ReferenceXAccessibleRelationSet(NULL);
+pRelationSet-AddRelation(
+AccessibleRelation( AccessibleRelationType::DESCRIBED_BY,
aSequence ) );
}
+return uno::ReferenceXAccessibleRelationSet(pRelationSet);
}
/** Return a copy of the state set.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/testCrashWhileSave.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |8 +
sw/source/filter/ww8/docxattributeoutput.cxx | 82 --
sw/source/filter/ww8/docxattributeoutput.hxx | 30 +-
sw/source/filter/ww8/docxexport.cxx |6 -
sw/source/filter/ww8/docxexport.hxx |3
6 files changed, 98 insertions(+), 31 deletions(-)
New commits:
commit 29c079f0480f63dd3f046f30c2b81023c2a5aebf
Author: Rohit Deshmukh rohit.deshm...@synerzip.com
Date: Thu Nov 21 11:17:40 2013 +0530
fdo#71594: Fix for LO crash while saving of file.
1] Libreoffice gets crashed while saving.
2] This caused:
testCrashWhileSave.docx file crashes on save
Tested on Libreoffice 4.2
Implementation:
1] It crashes when we are trying to access cell number 2 from
cells vector which contains only single cell. So put check
for cell number which we are accessing and Number of cells
in single row.
2] As we are exporting Header and footer in between when we are
exporting document.xml. In this case we are facing issue in
table export for header and footer. Because flags for table
is getting shared in both export.
So we are switching between flags in between exporting
document.xml and Header footer
export.
After fix:
1] No crash on save for testCrashWhileSave.docx and
opens successfully on MS Office 2010
Added Unit test case in export.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/6676
Change-Id: Iefbf565f7b512d76ac68e9353e225edca425ef06
diff --git a/sw/qa/extras/ooxmlexport/data/testCrashWhileSave.docx
b/sw/qa/extras/ooxmlexport/data/testCrashWhileSave.docx
new file mode 100644
index 000..2059951
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/testCrashWhileSave.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d594627..7428200 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2128,6 +2128,14 @@ DECLARE_OOXMLEXPORT_TEST(testFdo71785, fdo71785.docx)
// crashtest
}
+DECLARE_OOXMLEXPORT_TEST(testCrashWhileSave, testCrashWhileSave.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/footer1.xml);
+if (!pXmlDoc)
+return;
+CPPUNIT_ASSERT(getXPath(pXmlDoc,
/w:ftr/w:tbl/w:tr/w:tc[1]/w:p[1]/w:pPr/w:pStyle, val).match(Normal));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6896717..2d938b5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -237,9 +237,9 @@ void DocxAttributeOutput::StartParagraph(
ww8::WW8TableNodeInfo::Pointer_t pText
sal_uInt32 nCell = pTextNodeInfo-getCell();
// New cell/row?
-if ( m_nTableDepth 0 !m_bTableCellOpen )
+if ( m_tableReference-m_nTableDepth 0
!m_tableReference-m_bTableCellOpen )
{
-ww8::WW8TableNodeInfoInner::Pointer_t pDeepInner(
pTextNodeInfo-getInnerForDepth( m_nTableDepth ) );
+ww8::WW8TableNodeInfoInner::Pointer_t pDeepInner(
pTextNodeInfo-getInnerForDepth( m_tableReference-m_nTableDepth ) );
if ( pDeepInner-getCell() == 0 )
StartTableRow( pDeepInner );
@@ -253,10 +253,10 @@ void DocxAttributeOutput::StartParagraph(
ww8::WW8TableNodeInfo::Pointer_t pText
// continue the table cell]
sal_uInt32 nCurrentDepth = pTextNodeInfo-getDepth();
-if ( nCurrentDepth m_nTableDepth )
+if ( nCurrentDepth m_tableReference-m_nTableDepth )
{
// Start all the tables that begin here
-for ( sal_uInt32 nDepth = m_nTableDepth + 1; nDepth =
pTextNodeInfo-getDepth(); ++nDepth )
+for ( sal_uInt32 nDepth = m_tableReference-m_nTableDepth + 1;
nDepth = pTextNodeInfo-getDepth(); ++nDepth )
{
ww8::WW8TableNodeInfoInner::Pointer_t pInner(
pTextNodeInfo-getInnerForDepth( nDepth ) );
@@ -265,7 +265,7 @@ void DocxAttributeOutput::StartParagraph(
ww8::WW8TableNodeInfo::Pointer_t pText
StartTableCell( pInner );
}
-m_nTableDepth = nCurrentDepth;
+m_tableReference-m_nTableDepth = nCurrentDepth;
}
}
}
@@ -2014,13 +2014,18 @@ void DocxAttributeOutput::TableCellProperties(
ww8::WW8TableNodeInfoInner::Point
// Horizontal spans
const SwWriteTableRows aRows = m_pTableWrt-GetRows( );
SwWriteTableRow *pRow = aRows[
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/file/FPreparedStatement.cxx | 70
connectivity/source/drivers/file/FResultSet.cxx |7 -
connectivity/source/drivers/file/FStatement.cxx | 37
connectivity/source/inc/file/FPreparedStatement.hxx |4
connectivity/source/inc/file/FResultSet.hxx |2
connectivity/source/inc/file/FStatement.hxx |3
6 files changed, 40 insertions(+), 83 deletions(-)
New commits:
commit d87c2c59c9c1d5f5825f355c9eb941fdf95b42f6
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Fri Dec 13 13:10:49 2013 +0100
sdbc file driver (Prepared)Statement: created ResultSet owned by *caller*
That is the only choice that makes sense, since the
(Prepared)Statement could die (go out of scope) before the ResultSet.
User code could do that, if it does not need the (Prepared)Statement
anymore. Also, it is only natural for user code to dispose a ResultSet
that it does not need anymore.
So we need to create a fresh ResultSet each time.
The luck here is that the sdbc file driver does not implement
the XMultipleResults interface; things get more hairy then.
Change-Id: Ibf2cb5e5b7ca90432a289c185a6b4fe32d1ba565
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx
b/connectivity/source/drivers/file/FPreparedStatement.cxx
index d34c526..f247483 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -55,7 +55,6 @@ DBG_NAME( file_OPreparedStatement )
// -
OPreparedStatement::OPreparedStatement( OConnection* _pConnection)
: OStatement_BASE2( _pConnection )
-,m_pResultSet(NULL)
{
SAL_INFO( connectivity.drivers, file ocke.jans...@sun.com
OPreparedStatement::OPreparedStatement );
DBG_CTOR( file_OPreparedStatement, NULL );
@@ -74,15 +73,8 @@ void OPreparedStatement::disposing()
SAL_INFO( connectivity.drivers, file ocke.jans...@sun.com
OPreparedStatement::disposing );
::osl::MutexGuard aGuard(m_aMutex);
-clearMyResultSet();
OStatement_BASE2::disposing();
-if(m_pResultSet)
-{
-m_pResultSet-release();
-m_pResultSet = NULL;
-}
-
m_xParamColumns = NULL;
m_xMetaData.clear();
if(m_aParameterRow.is())
@@ -90,8 +82,6 @@ void OPreparedStatement::disposing()
m_aParameterRow-get().clear();
m_aParameterRow = NULL;
}
-
-
}
// -
void OPreparedStatement::construct(const OUString sql) throw(SQLException,
RuntimeException)
@@ -115,12 +105,17 @@ void OPreparedStatement::construct(const OUString sql)
throw(SQLException, Run
OValueRefRow aTemp;
OResultSet::setBoundedColumns(m_aEvaluateRow,aTemp,m_xParamColumns,xNames,sal_False,m_xDBMetaData,m_aColMapping);
+}
-m_pResultSet = createResultSet();
-m_pResultSet-acquire();
-m_xResultSet = ReferenceXResultSet(m_pResultSet);
-initializeResultSet(m_pResultSet);
+ReferenceXResultSet OPreparedStatement::makeResultSet()
+{
+OResultSet *pResultSet = createResultSet();
+ReferenceXResultSet xRS(pResultSet);
+initializeResultSet(pResultSet);
+initResultSet(pResultSet);
+return xRS;
}
+
// -
Any SAL_CALL OPreparedStatement::queryInterface( const Type rType )
throw(RuntimeException)
@@ -160,9 +155,6 @@ void SAL_CALL OPreparedStatement::close( )
throw(SQLException, RuntimeException
SAL_INFO( connectivity.drivers, file ocke.jans...@sun.com
OPreparedStatement::close );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
-
-
-clearMyResultSet();
}
// -
@@ -172,7 +164,12 @@ sal_Bool SAL_CALL OPreparedStatement::execute( )
throw(SQLException, RuntimeExc
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
-initResultSet();
+ReferenceXResultSet xRS(makeResultSet());
+
+// since we don't support the XMultipleResults interface, nobody will ever
get that ResultSet...
+Reference XComponent xComp(xRS, UNO_QUERY);
+if (xComp.is())
+xComp-dispose();
return m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT;
}
@@ -184,9 +181,20 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( )
throw(SQLException, Run
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatement_BASE::rBHelper.bDisposed);
-initResultSet();
-
-return m_pResultSet ? m_pResultSet-getRowCountResult() : sal_Int32(0);
+ReferenceXResultSet xRS(makeResultSet());
+if(xRS.is())
+{
+assert(dynamic_castOResultSet*(xRS.get()));
+const sal_Int32
[Libreoffice-commits] core.git: vcl/generic vcl/inc vcl/source
vcl/generic/glyphs/gcach_ftyp.cxx |5 +++-- vcl/inc/graphite_features.hxx |1 + vcl/inc/graphite_layout.hxx |1 + vcl/inc/graphite_static.hxx | 17 + vcl/inc/win/salgdi.h |3 ++- vcl/source/glyphs/graphite_layout.cxx |1 + 6 files changed, 25 insertions(+), 3 deletions(-) New commits: commit 8949d6f32acb9046cb3ddceb4f6fbe39dcc04383 Author: Michael Meeks michael.me...@collabora.com Date: Fri Dec 13 13:20:10 2013 + graphite2: get visibility right for static linkage on windows. Change-Id: I79fa15d539bcb86610dd4def08536c33bd2a10c2 diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index b153e5c..62d114e 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -26,8 +26,9 @@ #include config_features.h #include config_graphite.h #if ENABLE_GRAPHITE -#include graphite2/Font.h -#include graphite_layout.hxx +# include graphite_static.hxx +# include graphite2/Font.h +# include graphite_layout.hxx #endif #include unotools/fontdefs.hxx diff --git a/vcl/inc/graphite_features.hxx b/vcl/inc/graphite_features.hxx index da8e619..0202497 100644 --- a/vcl/inc/graphite_features.hxx +++ b/vcl/inc/graphite_features.hxx @@ -23,6 +23,7 @@ // 1001=12002=2fav1=0 #include sal/types.h #include rtl/ustring.hxx +#include graphite_static.hxx #include graphite2/Font.h namespace grutils diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx index 30fe111..ce8989c 100644 --- a/vcl/inc/graphite_layout.hxx +++ b/vcl/inc/graphite_layout.hxx @@ -31,6 +31,7 @@ #include map #include utility // Libraries +#include graphite_static.hxx #include graphite2/Font.h #include graphite2/Segment.h // Platform diff --git a/vcl/inc/graphite_static.hxx b/vcl/inc/graphite_static.hxx new file mode 100644 index 000..4c70cf1 --- /dev/null +++ b/vcl/inc/graphite_static.hxx @@ -0,0 +1,17 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifdef WNT +# ifndef GRAPHITE2_STATIC +#define GRAPHITE2_STATIC 1 +# endif +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ + diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 2441252..f29fd94 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -31,7 +31,8 @@ #include config_graphite.h #if ENABLE_GRAPHITE -#include graphite2/Font.h +# include graphite_static.hxx +# include graphite2/Font.h #endif class FontSelectPattern; diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index b4498cf..0231bb4 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -49,6 +49,7 @@ #include unicode/uscript.h // Graphite Libraries (must be after vcl headers on windows) +#include graphite_static.hxx #include graphite2/Segment.h #include graphite_layout.hxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/output.cxx | 30 --
1 file changed, 4 insertions(+), 26 deletions(-)
New commits:
commit 1b3f3ce53a26ba52d27784a2f9adbffcbd6169f3
Author: Noel Power noel.po...@suse.com
Date: Wed Aug 14 12:21:55 2013 +0100
Revert Always disable anti-aliasing for drawing cell borders. fdo#60805
Unfortunately this patch creates a very weird ( and took me forever to find
) bug ( fdo#60805 ). Basically certain double line borders seems to
dissappear at certain zoom levels. I guess maybe its possible to tweak
the create2DDecomposition to process the line as hairline at those
problematic
zoom levels ( but I suspect that actually would look worse ) Best maybe
would be to tweak the rendering/painting ( but isn't that processor specific
maybe ? ) as is maybe this problem. I admit this is outside my comfort zone
:/
This reverts commit a551cad4e35b6b664167d65dfc25e5a0f6990687.
Change-Id: Idb25493ffb038cb1f8ae9b364a29052abafd940d
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 757bca6..eaa660d 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -24,7 +24,6 @@
#include editeng/brushitem.hxx
#include editeng/editdata.hxx
#include svtools/colorcfg.hxx
-#include svtools/optionsdrawinglayer.hxx
#include svx/rotmodit.hxx
#include editeng/shaditem.hxx
#include editeng/svxfont.hxx
@@ -1263,7 +1262,10 @@ void ScOutputData::DrawClear()
}
}
-namespace {
+
+//
+// Linien
+//
long lclGetSnappedX( OutputDevice rDev, long nPosX, bool bSnapPixel )
{
@@ -1280,32 +1282,8 @@ size_t lclGetArrayColFromCellInfoX( sal_uInt16
nCellInfoX, sal_uInt16 nCellInfoF
return static_cast size_t ( bRTL ? (nCellInfoLastX + 2 - nCellInfoX) :
(nCellInfoX - nCellInfoFirstX) );
}
-/**
- * Temporarily turn off antialiasing.
- */
-class AntiAliasingSwitch
-{
-SvtOptionsDrawinglayer maDrawOpt;
-bool mbOldSetting;
-public:
-AntiAliasingSwitch(bool bOn) : mbOldSetting(maDrawOpt.IsAntiAliasing())
-{
-maDrawOpt.SetAntiAliasing(bOn);
-}
-
-~AntiAliasingSwitch()
-{
-maDrawOpt.SetAntiAliasing(mbOldSetting);
-}
-};
-
-}
-
void ScOutputData::DrawFrame()
{
-// No anti-aliasing for drawing cell borders.
-AntiAliasingSwitch aAASwitch(false);
-
sal_uLong nOldDrawMode = mpDev-GetDrawMode();
Color aSingleColor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/view/output.cxx | 30 --
1 file changed, 4 insertions(+), 26 deletions(-)
New commits:
commit 415b47827fae8ad0c2a747ca9b062170f00f1e7c
Author: Noel Power noel.po...@suse.com
Date: Wed Aug 14 12:21:55 2013 +0100
Revert Always disable anti-aliasing for drawing cell borders. fdo#60805
Unfortunately this patch creates a very weird ( and took me forever to find
) bug ( fdo#60805 ). Basically certain double line borders seems to
dissappear at certain zoom levels. I guess maybe its possible to tweak
the create2DDecomposition to process the line as hairline at those
problematic
zoom levels ( but I suspect that actually would look worse ) Best maybe
would be to tweak the rendering/painting ( but isn't that processor specific
maybe ? ) as is maybe this problem. I admit this is outside my comfort zone
:/
This reverts commit a551cad4e35b6b664167d65dfc25e5a0f6990687.
Change-Id: Idb25493ffb038cb1f8ae9b364a29052abafd940d
(cherry picked from commit 1b3f3ce53a26ba52d27784a2f9adbffcbd6169f3)
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 71d469e..1a5cdde 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -24,7 +24,6 @@
#include editeng/brushitem.hxx
#include editeng/editdata.hxx
#include svtools/colorcfg.hxx
-#include svtools/optionsdrawinglayer.hxx
#include svx/rotmodit.hxx
#include editeng/shaditem.hxx
#include editeng/svxfont.hxx
@@ -1280,7 +1279,10 @@ void ScOutputData::DrawClear()
}
}
-namespace {
+
+//
+// Linien
+//
long lclGetSnappedX( OutputDevice rDev, long nPosX, bool bSnapPixel )
{
@@ -1297,32 +1299,8 @@ size_t lclGetArrayColFromCellInfoX( sal_uInt16
nCellInfoX, sal_uInt16 nCellInfoF
return static_cast size_t ( bRTL ? (nCellInfoLastX + 2 - nCellInfoX) :
(nCellInfoX - nCellInfoFirstX) );
}
-/**
- * Temporarily turn off antialiasing.
- */
-class AntiAliasingSwitch
-{
-SvtOptionsDrawinglayer maDrawOpt;
-bool mbOldSetting;
-public:
-AntiAliasingSwitch(bool bOn) : mbOldSetting(maDrawOpt.IsAntiAliasing())
-{
-maDrawOpt.SetAntiAliasing(bOn);
-}
-
-~AntiAliasingSwitch()
-{
-maDrawOpt.SetAntiAliasing(mbOldSetting);
-}
-};
-
-}
-
void ScOutputData::DrawFrame()
{
-// No anti-aliasing for drawing cell borders.
-AntiAliasingSwitch aAASwitch(false);
-
sal_uLong nOldDrawMode = mpDev-GetDrawMode();
Color aSingleColor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source include/formula sc/source
formula/source/core/resource/core_resource.src |4
include/formula/compiler.hrc |1 -
include/formula/opcode.hxx |1 -
sc/source/core/inc/interpre.hxx|2 --
sc/source/core/tool/parclass.cxx |1 -
5 files changed, 9 deletions(-)
New commits:
commit d1e1cd128c83982f69331c92a8e319d3031a7685
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date: Tue Dec 10 13:05:52 2013 +0100
remove unused code (ancient Calc function ZELLERROR)
code has no function, except that calc documents with formula
ZELLERROR will not produce an error. But the formula is not
interpreted, so remains 'dead code'.
Change-Id: I6e7df7040a0273bcd3ebd497055924b7afdd3311
Reviewed-on: https://gerrit.libreoffice.org/7018
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 5b2220a..84faa58 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -143,7 +143,6 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_GAMMA_LN { Text = GAMMALN ; };
String SC_OPCODE_GAMMA_LN_MS { Text = COM.MICROSOFT.GAMMALN.PRECISE ; };
String SC_OPCODE_ERROR_TYPE { Text = ORG.OPENOFFICE.ERRORTYPE ; };
-String SC_OPCODE_ERR_CELL { Text = ZellError ; }; // TODO: ancient
legacy only, remove?
String SC_OPCODE_FORMULA { Text = FORMULA; };
String SC_OPCODE_ARC_TAN_2 { Text = ATAN2 ; };
String SC_OPCODE_CEIL { Text = CEILING ; };
@@ -518,7 +517,6 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_GAMMA_LN { Text = GAMMALN ; };
String SC_OPCODE_GAMMA_LN_MS { Text = _xlfn.GAMMALN.PRECISE ; };
String SC_OPCODE_ERROR_TYPE { Text = ERRORTYPE ; };
-String SC_OPCODE_ERR_CELL { Text = ZellError ; }; // TODO: ancient
legacy only, remove?
String SC_OPCODE_FORMULA { Text = _xlfn.FORMULATEXT; };
String SC_OPCODE_ARC_TAN_2 { Text = ATAN2 ; };
String SC_OPCODE_CEIL { Text = CEILING ; };
@@ -895,7 +893,6 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_GAMMA_LN { Text = GAMMALN ; };
String SC_OPCODE_GAMMA_LN_MS { Text = GAMMALN.PRECISE ; };
String SC_OPCODE_ERROR_TYPE { Text = ERRORTYPE ; };
-String SC_OPCODE_ERR_CELL { Text = ZellError ; }; // TODO: ancient
legacy only, remove?
String SC_OPCODE_FORMULA { Text = FORMULA; };
String SC_OPCODE_ARC_TAN_2 { Text = ATAN2 ; };
String SC_OPCODE_CEIL { Text = CEILING ; };
@@ -1555,7 +1552,6 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = ERRORTYPE ;
};
-String SC_OPCODE_ERR_CELL { Text = ZellError ; }; // TODO: ancient
legacy only, remove?
String SC_OPCODE_FORMULA
{
Text [ en-US ] = FORMULA ;
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index b71c746..7dacf307 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -182,7 +182,6 @@
#define SC_OPCODE_S_NORM_INV149
#define SC_OPCODE_GAMMA_LN 150
#define SC_OPCODE_ERROR_TYPE151
-#define SC_OPCODE_ERR_CELL 152
#define SC_OPCODE_FORMULA 153
#define SC_OPCODE_ARABIC154
#define SC_OPCODE_INFO 155
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 18e2a34..0b08532 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -176,7 +176,6 @@ enum OpCodeEnum
ocGammaLn_MS= SC_OPCODE_GAMMA_LN_MS,
ocGamma = SC_OPCODE_GAMMA,
ocErrorType = SC_OPCODE_ERROR_TYPE,
-ocErrCell = SC_OPCODE_ERR_CELL,
ocFormula = SC_OPCODE_FORMULA,
ocArabic= SC_OPCODE_ARABIC,
ocInfo = SC_OPCODE_INFO,
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 5171f30..c2a82f3 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -357,8 +357,6 @@ ScMatrixRef GetMatrix();
sc::RangeMatrix GetRangeMatrix();
void ScTableOp(); // repeated operations
-void ScErrCell(); // special handling for
-// error cell
// common helper functions
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 550b116..db42e46 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -62,7 +62,6 @@ const ScParameterClassification::RawData
ScParameterClassification::pRawData[] =
{ ocClose, {{ Bounds
}, 0 }},
{ ocSep, {{ Bounds
}, 0 }},
[Libreoffice-commits] core.git: cppuhelper/source include/cppuhelper stoc/source
cppuhelper/source/compat.cxx| 11
cppuhelper/source/loadsharedlibcomponentfactory.hxx | 34 ++
cppuhelper/source/servicemanager.cxx|7 +-
cppuhelper/source/shlib.cxx | 48
include/cppuhelper/shlib.hxx| 30
stoc/source/loader/dllcomponentloader.cxx |2
6 files changed, 80 insertions(+), 52 deletions(-)
New commits:
commit 2f7b329297c65d75f428d389a53b5822e38b0ec5
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 13 15:10:18 2013 +0100
[API CHANGE] remove cppu::loadSharedLibComponentFactory w/ rPrefix again
...it was never meant to be called by client code anyway and is no longer
needed
to be exposed since the global service manager implementation moved to
cppuhelper.
Change-Id: If2d0510b2364084d36edeb156a3459d9b8aeb983
diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx
index c507540..97605b0 100644
--- a/cppuhelper/source/compat.cxx
+++ b/cppuhelper/source/compat.cxx
@@ -103,6 +103,17 @@ invokeStaticComponentFactory(
for (;;) { std::abort(); } // avoid must return a value warnings
}
+SAL_DLLPUBLIC_EXPORT css::uno::Referencecss::uno::XInterface SAL_CALL
+loadSharedLibComponentFactory(
+rtl::OUString const , rtl::OUString const , rtl::OUString const ,
+css::uno::Referencecss::lang::XMultiServiceFactory const ,
+css::uno::Referencecss::registry::XRegistryKey const ,
+rtl::OUString const )
+SAL_THROW((css::loader::CannotActivateFactoryException))
+{
+for (;;) { std::abort(); } // avoid must return a value warnings
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/loadsharedlibcomponentfactory.hxx
b/cppuhelper/source/loadsharedlibcomponentfactory.hxx
new file mode 100644
index 000..b0986dd
--- /dev/null
+++ b/cppuhelper/source/loadsharedlibcomponentfactory.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef CPPUHELPER_SOURCE_LOADSHAREDLIBCOMPONENTFACTORY_HXX
+#define CPPUHELPER_SOURCE_LOADSHAREDLIBCOMPONENTFACTORY_HXX
+
+#include sal/config.h
+
+#include com/sun/star/uno/Reference.hxx
+
+namespace com { namespace sun { namespace star {
+namespace lang { class XMultiServiceFactory; }
+namespace uno { class XInterface; }
+} } }
+namespace rtl { class OUString; }
+
+namespace cppuhelper { namespace detail {
+
+css::uno::Referencecss::uno::XInterface loadSharedLibComponentFactory(
+rtl::OUString const uri, rtl::OUString const prefix,
+rtl::OUString const rImplName,
+css::uno::Referencecss::lang::XMultiServiceFactory const xMgr);
+
+} }
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/servicemanager.cxx
b/cppuhelper/source/servicemanager.cxx
index 055bdd3..ae2060d 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -41,6 +41,8 @@
#include rtl/strbuf.hxx
#include sal/log.hxx
+#include loadsharedlibcomponentfactory.hxx
+
using rtl::OUString;
using rtl::OString;
using rtl::OStringBuffer;
@@ -652,9 +654,8 @@ void cppuhelper::ServiceManager::loadImplementation(
if (!prefix.isEmpty()) {
prefix += _;
}
-f0 = cppu::loadSharedLibComponentFactory(
-uri, rtl::OUString(), info-name, this,
-css::uno::Reference css::registry::XRegistryKey (), prefix);
+f0 = cppuhelper::detail::loadSharedLibComponentFactory(
+uri, prefix, info-name, this);
} else {
SAL_WARN_IF(
!info-prefix.isEmpty(), cppuhelper,
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index e941b9d..8ad77f5 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -27,6 +27,8 @@
#include com/sun/star/beans/XPropertySet.hpp
+#include loadsharedlibcomponentfactory.hxx
+
#include stdio.h
#ifdef ANDROID
@@ -44,12 +46,11 @@ using namespace ::com::sun::star::uno;
using rtl::OString;
using rtl::OUString;
-namespace cppu
-{
+namespace {
#ifndef DISABLE_DYNLOADING
-static void getLibEnv(oslModulelib,
+void getLibEnv(oslModulelib,
uno::Environment * pEnv,
OUString * pSourceEnv_name,
uno::Environment const cTargetEnv,
@@ -104,7 +105,7 @@ static void getLibEnv(oslModulelib,
#endif
-extern C {static void s_getFactory(va_list * pParam)
+extern C void s_getFactory(va_list * pParam)
{
component_getFactoryFunc pSym
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/export/drawingml.hxx |2 ++
oox/source/export/drawingml.cxx |7 +++
oox/source/export/shapes.cxx | 13 -
3 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 445d3d8484d6e480f461de305c9dc4def067cf20
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Dec 13 15:01:35 2013 +0100
drawingml export: handle child shapes when exporting groupshapes
Change-Id: I4ed800ad17750c87788108417c8a7b1817853115
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 67feca1..00ec32e 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -88,6 +88,8 @@ protected:
::com::sun::star::uno::Any mAny;
::sax_fastparser::FSHelperPtr mpFS;
::oox::core::XmlFilterBase* mpFB;
+/// If set, this is the parent of the currently handled shape.
+com::sun::star::uno::Referencecom::sun::star::drawing::XShape m_xParent;
bool GetProperty( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet, OUString aName );
bool GetPropertyAndState( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet,
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 3ed8f02..0e8db87 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -670,6 +670,13 @@ void DrawingML::WriteShapeTransformation( Reference
XShape rXShape, sal_Int32
awt::Point aPos = rXShape-getPosition();
awt::Size aSize = rXShape-getSize();
+if (m_xParent.is())
+{
+awt::Point aParentPos = m_xParent-getPosition();
+aPos.X -= aParentPos.X;
+aPos.Y -= aParentPos.Y;
+}
+
if ( aSize.Width 0 )
aSize.Width = 1000;
if ( aSize.Height 0 )
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index e2e7a13..3e9a082 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -256,7 +256,18 @@ ShapeExport
ShapeExport::WriteGroupShape(uno::Referencedrawing::XShape xShape
WriteShapeTransformation(xShape, XML_a);
pFS-endElementNS(mnXmlNamespace, XML_grpSpPr);
-// TODO: children
+uno::Referencedrawing::XShapes xGroupShape(xShape, uno::UNO_QUERY_THROW);
+uno::Referencedrawing::XShape xParent = m_xParent;
+m_xParent = xShape;
+for (sal_Int32 i = 0; i xGroupShape-getCount(); ++i)
+{
+uno::Referencedrawing::XShape xChild(xGroupShape-getByIndex(i),
uno::UNO_QUERY_THROW);
+sal_Int32 nSavedNamespace = mnXmlNamespace;
+mnXmlNamespace = XML_wps;
+WriteShape(xChild);
+mnXmlNamespace = nSavedNamespace;
+}
+m_xParent = xParent;
pFS-endElementNS(mnXmlNamespace, XML_wgp);
return *this;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/analysisofvariancedialog.ui|2 +- sc/uiconfig/scalc/ui/correlationdialog.ui |2 +- sc/uiconfig/scalc/ui/covariancedialog.ui|2 +- sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui |2 +- sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui |2 +- sc/uiconfig/scalc/ui/movingaveragedialog.ui |2 +- sc/uiconfig/scalc/ui/samplingdialog.ui |2 +- sc/uiconfig/scalc/ui/ttestdialog.ui |2 +- 8 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 6df78d1a4c9bf5e0e182d5cdc0a300e3c84e6d86 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Dec 13 09:21:55 2013 -0500 fdo#70989: Change wording from Output Range to Results to. To avoid the impression that this reference box takes a range... Change-Id: I3a69cf496f013779692c17fb943dcc34a1692275 diff --git a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui index 5b318c4..9a882db 100644 --- a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui +++ b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui @@ -136,7 +136,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesOutput Range/property +property name=label translatable=yesResults to/property property name=use_underlineTrue/property property name=mnemonic_widgetoutput-range-edit/property /object diff --git a/sc/uiconfig/scalc/ui/correlationdialog.ui b/sc/uiconfig/scalc/ui/correlationdialog.ui index c8ff577..1e9639b 100644 --- a/sc/uiconfig/scalc/ui/correlationdialog.ui +++ b/sc/uiconfig/scalc/ui/correlationdialog.ui @@ -129,7 +129,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesOutput Range/property +property name=label translatable=yesResults to/property property name=use_underlineTrue/property property name=mnemonic_widgetoutput-range-edit/property /object diff --git a/sc/uiconfig/scalc/ui/covariancedialog.ui b/sc/uiconfig/scalc/ui/covariancedialog.ui index 05acbf4..5647d5f 100644 --- a/sc/uiconfig/scalc/ui/covariancedialog.ui +++ b/sc/uiconfig/scalc/ui/covariancedialog.ui @@ -129,7 +129,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesOutput Range/property +property name=label translatable=yesResults to/property property name=use_underlineTrue/property property name=mnemonic_widgetoutput-range-edit/property /object diff --git a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui index b32e2b3..189244c 100644 --- a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui +++ b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui @@ -129,7 +129,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesOutput Range/property +property name=label translatable=yesResults to/property property name=use_underlineTrue/property property name=mnemonic_widgetoutput-range-edit/property /object diff --git a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui index d12a8bc..b74732d 100644 --- a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui +++ b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui @@ -135,7 +135,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesOutput Range/property +property name=label translatable=yesResults to/property property name=use_underlineTrue/property property name=mnemonic_widgetoutput-range-edit/property /object diff --git a/sc/uiconfig/scalc/ui/movingaveragedialog.ui b/sc/uiconfig/scalc/ui/movingaveragedialog.ui index 9e1f667..3f75dbc 100644 --- a/sc/uiconfig/scalc/ui/movingaveragedialog.ui +++ b/sc/uiconfig/scalc/ui/movingaveragedialog.ui @@ -136,7 +136,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesOutput
Re: Efficient UNO component linkage GC ...
On 12/13/2013 12:56 PM, Stephan Bergmann wrote: Nowadays, the only code involved for passively registered components are cppuhelper/source/servicemanager.cxx reading the .rdb data and passing off instantiation requests to cppuhelper/source/shlib.cxx. For historical reasons they do so via a published additional cppu::loadSharedLibComponentFactory overload (with additional prefix argument), but that communication channel should rather be private. Made it private now with http://cgit.freedesktop.org/libreoffice/core/commit/?id=2f7b329297c65d75f428d389a53b5822e38b0ec5 [API CHANGE] remove cppu::loadSharedLibComponentFactory w/ rPrefix again (which is only nominally an API change). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/file/FResultSet.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit d203855908dfb139f9ba2f755d5056de7c34d842
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 13 15:37:24 2013 +0100
assert non-nullness
dd0990db74a4a5c3a129a7ff0ed2a739cd74a381 fdo#72463 RowSet: on execute when
not
dirty, rebuild cache had temporarily introduced a bug that caused
m_pParseTree
to be null here during JunitTest_dbaccess_unoapi, but Lionel states that it
cannot legitimately be null, even though the computation of m_bIsCount in
the
ctor takes potentially null m_pParseTree into account.
Change-Id: If95f076a4c80f80cd58bba83521633fe8bb71f5d
diff --git a/connectivity/source/drivers/file/FResultSet.cxx
b/connectivity/source/drivers/file/FResultSet.cxx
index d8fbde1..11da82b 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -1428,6 +1428,7 @@ sal_Bool OResultSet::OpenImpl()
else
{
sal_Bool bDistinct = sal_False;
+assert(m_pParseTree != 0);
OSQLParseNode *pDistinct = m_pParseTree-getChild(1);
assert(m_aOrderbyColumnNumber.size() ==
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] HiDPI fixes for squiggly underlines
Hi Keith, Keith Curtis píše v Po 09. 12. 2013 v 19:36 -0500: LibreOffice looks good on a HiDPI screens but there are a few small bugs such as (fdo#51735) So I'm working on fixing the squiggly underlines. Patch included below. First of all, thank you so much for the patches you have submitted so far! I looked at them, and what I think fits best at the moment is a kind of float mfHidpiRatio (or so) set on the startup that will tell internally how much should we scale the various UI elements in order to look correctly on the given device. With that, we should be able to touch as low level parts as possible to get the effect that is desirable; I'd hope that for example for the squiggly lines, we would be able to modify ImplDrawWaveLine() directly so that all the callers immediately get the waves that fit the hidpi screen nicely. Unfortunately I cannot do much on this / integrate your patches this week yet [4.2 UI freeze on Monday ;-)], but I'll do that early next week - I hope that is OK for you? All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cppuhelper/source
cppuhelper/source/shlib.cxx | 72 +---
1 file changed, 41 insertions(+), 31 deletions(-)
New commits:
commit a4ed79bbf615fec10b39f46a5828ffea04d84f4e
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 13 16:18:52 2013 +0100
Shortcut common case of calling same-env component_getFactory fn
Change-Id: I7f5d31c3b3e128b2df4d83c915673bf7b5d2ab8c
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 8ad77f5..ecb3f1f 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -188,47 +188,57 @@ Reference XInterface invokeComponentFactory(
fprintf(stderr, invokeComponentFactory envDcp:%s implName:%s
modPath:%s\n, envDcp.getStr(), implName.getStr(), modPath.getStr());
}
#endif
-
-Mapping aCurrent2Env( currentEnv, env );
-Mapping aEnv2Current( env, currentEnv );
-
-if (aCurrent2Env.is() aEnv2Current.is())
+if (env.get() == currentEnv.get())
{
-void * pSMgr = aCurrent2Env.mapInterface(
-xMgr.get(), ::getCppuType( xMgr ) );
+xRet.set(
+static_castcss::uno::XInterface *(
+(*reinterpret_castcomponent_getFactoryFunc(pGetter))(
+aImplName.getStr(), xMgr.get(), 0)),
+SAL_NO_ACQUIRE);
+}
+else
+{
+Mapping aCurrent2Env( currentEnv, env );
+Mapping aEnv2Current( env, currentEnv );
-void * pSSF = NULL;
+if (aCurrent2Env.is() aEnv2Current.is())
+{
+void * pSMgr = aCurrent2Env.mapInterface(
+xMgr.get(), ::getCppuType( xMgr ) );
-env.invoke(s_getFactory, pGetter, aImplName, pSMgr, 0, pSSF);
+void * pSSF = NULL;
-if (pSMgr)
-{
-(*env.get()-pExtEnv-releaseInterface)(
-env.get()-pExtEnv, pSMgr );
-}
+env.invoke(s_getFactory, pGetter, aImplName, pSMgr, 0, pSSF);
-if (pSSF)
-{
-aEnv2Current.mapInterface(
-reinterpret_cast void ** ( xRet ),
-pSSF, ::getCppuType( xRet ) );
-(env.get()-pExtEnv-releaseInterface)(
-env.get()-pExtEnv, pSSF );
+if (pSMgr)
+{
+(*env.get()-pExtEnv-releaseInterface)(
+env.get()-pExtEnv, pSMgr );
+}
+
+if (pSSF)
+{
+aEnv2Current.mapInterface(
+reinterpret_cast void ** ( xRet ),
+pSSF, ::getCppuType( xRet ) );
+(env.get()-pExtEnv-releaseInterface)(
+env.get()-pExtEnv, pSSF );
+}
+else
+{
+rExcMsg = rModulePath +
+: cannot get factory of +
+demanded implementation: +
+OStringToOUString(
+aImplName, RTL_TEXTENCODING_ASCII_US );
+}
}
else
{
-rExcMsg = rModulePath +
- : cannot get factory of +
- demanded implementation: +
- OStringToOUString(
-aImplName, RTL_TEXTENCODING_ASCII_US );
+rExcMsg =
+cannot get uno mappings: C++ = UNO!;
}
}
-else
-{
-rExcMsg =
-cannot get uno mappings: C++ = UNO!;
-}
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/uiconfig
sc/uiconfig/scalc/ui/analysisofvariancedialog.ui|2 +- sc/uiconfig/scalc/ui/correlationdialog.ui |2 +- sc/uiconfig/scalc/ui/covariancedialog.ui|2 +- sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui |2 +- sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui |2 +- sc/uiconfig/scalc/ui/movingaveragedialog.ui |2 +- sc/uiconfig/scalc/ui/samplingdialog.ui |2 +- 7 files changed, 7 insertions(+), 7 deletions(-) New commits: commit bb4406c326315d3e1864f7dd9aaf286086ea0701 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Fri Dec 13 09:37:22 2013 -0500 fdo#70989: Change wording from Output Range to Results to. To avoid the impression that this reference box takes a range... Manually cherry-picked from 6df78d1a4c9bf5e0e182d5cdc0a300e3c84e6d86. Change-Id: I3a69cf496f013779692c17fb943dcc34a1692275 diff --git a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui index 5b318c4..9a882db 100644 --- a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui +++ b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui @@ -136,7 +136,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesOutput Range/property +property name=label translatable=yesResults to/property property name=use_underlineTrue/property property name=mnemonic_widgetoutput-range-edit/property /object diff --git a/sc/uiconfig/scalc/ui/correlationdialog.ui b/sc/uiconfig/scalc/ui/correlationdialog.ui index c8ff577..1e9639b 100644 --- a/sc/uiconfig/scalc/ui/correlationdialog.ui +++ b/sc/uiconfig/scalc/ui/correlationdialog.ui @@ -129,7 +129,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesOutput Range/property +property name=label translatable=yesResults to/property property name=use_underlineTrue/property property name=mnemonic_widgetoutput-range-edit/property /object diff --git a/sc/uiconfig/scalc/ui/covariancedialog.ui b/sc/uiconfig/scalc/ui/covariancedialog.ui index 05acbf4..5647d5f 100644 --- a/sc/uiconfig/scalc/ui/covariancedialog.ui +++ b/sc/uiconfig/scalc/ui/covariancedialog.ui @@ -129,7 +129,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesOutput Range/property +property name=label translatable=yesResults to/property property name=use_underlineTrue/property property name=mnemonic_widgetoutput-range-edit/property /object diff --git a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui index b32e2b3..189244c 100644 --- a/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui +++ b/sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui @@ -129,7 +129,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesOutput Range/property +property name=label translatable=yesResults to/property property name=use_underlineTrue/property property name=mnemonic_widgetoutput-range-edit/property /object diff --git a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui index d12a8bc..b74732d 100644 --- a/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui +++ b/sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui @@ -135,7 +135,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesOutput Range/property +property name=label translatable=yesResults to/property property name=use_underlineTrue/property property name=mnemonic_widgetoutput-range-edit/property /object diff --git a/sc/uiconfig/scalc/ui/movingaveragedialog.ui b/sc/uiconfig/scalc/ui/movingaveragedialog.ui index 9e1f667..3f75dbc 100644 --- a/sc/uiconfig/scalc/ui/movingaveragedialog.ui +++ b/sc/uiconfig/scalc/ui/movingaveragedialog.ui @@ -136,7 +136,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 70989, which changed state. Bug 70989 Summary: Output range only shows the first cell in Statistic Sampling dialog https://bugs.freedesktop.org/show_bug.cgi?id=70989 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: CppUnit CMake build system
Hey, 2013/12/12 Bernhard Seßler bernhard.sess...@corscience.de Hi @cppunit developers / users, I'm currently working on replacing the autoconf build system and the MSVC solutions used by cppunit with a CMake based build system. Currently it successfully builds the libraries on Windows and Linux - using the GCC, MSVC and Borland C++ compilers. I started this project in order to be able to _easily_ build cppunit on different platforms with a variety of compilers, as my company is using it for testing different projects. All I wanted to know know now is whether there's official interest in getting this (IMHO quite drastic) change mainline. If so, I would clean up my CMake branch (and the work I've done so far) and post patches on this ML. Please also that in its current state merely the library itself is built and installed, I've not yet started working on the examples and platform specific test runners. But it's on my roadmap to integrate these, too. The next step would therefore be to get the msvc6 related stuff working as well as porting the qttestrunner module to Qt4 and Qt5. (it's still based on Qt3). So in general I'm very happy to accept patches: I'm just not convinced that another build system is the right step right now. We provide MSVC project/solution files for Windows and a autotools based build system for the rest that works quite well. Additionally I understand the current build system and feel competent to maintain it which I'm not sure I will be with a cmake based build system. However if it helps we can surely push build system patches into a branch which might make it easier for you to keep the patches in sync with the cppunit development. How does this sound to you? Regards, Markus Any feedback on this would be appreciated. -- Mit freundlichen Grüßen / Kind Regards, Bernhard Seßler, B.A. RD Corscience GmbH Co. KG Henkestr. 91 D-91052 Erlangen Germany Tel: +49 9131 977986-516 Fax: +49 9131 977986-445 e-mail: bernhard.sess...@corscience.de mailto: bernhard.sess...@corscience.de Internet: www.corscience.de http://www.corscience.de/ -- Corscience GmbH Co. KG Sitz der Gesellschaft/Place of business: Erlangen Amtsgericht/Local court: Fürth Handelsregisternummer/Commercial Register No.: HRA 7510 Geschäftsführer/Managing director: Prof. Dr. Armin Bolz, Dipl.-Volksw. Marc Griefahn CONFIDENTIALITY: This e-mail and any attachments are confidential and may also be privileged. If received in error, please do not disclose the contents to anyone, but notify us immediately by return e-mail and delete this e-mail and any attachments from your system. Thank you. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/qa sc/source
sc/qa/unit/subsequent_export-test.cxx |4 +-- sc/source/filter/excel/excrecds.cxx| 30 ++--- sc/source/filter/oox/worksheetsettings.cxx | 30 ++--- 3 files changed, 32 insertions(+), 32 deletions(-) New commits: commit ed0f9df37cac6c2e8d886488b2dbbe1034e0d385 Author: Noel Power noel.po...@suse.com Date: Thu Nov 21 18:12:50 2013 + fdo#70499 selectn of lock/unlocked cells with worksheet protection reversed The ooxml spec documentation is rather confusing ( for me at least ) and the sense of the of the sheetProtection attributes as described seems reversed to how I read it ( or maybe it is the equivelant option in ScTableProtection that operates with the reverse sense shrug ) In anycase the import ( and export ) have been adjusted to take that into consideration, also the export now actually deals with the defaults correctly. Change-Id: Ia69567b8898b39c9d171486cfa800e1748c5814b Reviewed-on: https://gerrit.libreoffice.org/7075 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 9a06e9a..f7b5141 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -347,8 +347,8 @@ void ScExportTest::testSheetProtectionXLSX() CPPUNIT_ASSERT( (sal_uInt8)aHash[1] == 61 ); } // we could flesh out this check I guess -CPPUNIT_ASSERT ( pTabProtect-isOptionEnabled( ScTableProtection::OBJECTS ) ); -CPPUNIT_ASSERT ( pTabProtect-isOptionEnabled( ScTableProtection::SCENARIOS ) ); +CPPUNIT_ASSERT ( !pTabProtect-isOptionEnabled( ScTableProtection::OBJECTS ) ); +CPPUNIT_ASSERT ( !pTabProtect-isOptionEnabled( ScTableProtection::SCENARIOS ) ); } xDocSh-DoClose(); } diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 39e4222..4330fe0 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -520,21 +520,21 @@ void XclExpSheetProtection::SaveXml( XclExpXmlStream rStrm ) rWorksheet-singleElement( XML_sheetProtection, XML_sheet, XclXmlUtils::ToPsz( true ), XML_password, sHash.getStr(), -XML_objects, pTabProtect-isOptionEnabled( ScTableProtection::OBJECTS ) ? XclXmlUtils::ToPsz( true ) : NULL, -XML_scenarios, pTabProtect-isOptionEnabled( ScTableProtection::SCENARIOS ) ? XclXmlUtils::ToPsz( true ) : NULL, -XML_formatCells, pTabProtect-isOptionEnabled( ScTableProtection::FORMAT_CELLS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_formatColumns, pTabProtect-isOptionEnabled( ScTableProtection::FORMAT_COLUMNS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_formatRows, pTabProtect-isOptionEnabled( ScTableProtection::FORMAT_ROWS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_insertColumns, pTabProtect-isOptionEnabled( ScTableProtection::INSERT_COLUMNS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_insertRows, pTabProtect-isOptionEnabled( ScTableProtection::INSERT_ROWS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_insertHyperlinks, pTabProtect-isOptionEnabled( ScTableProtection::INSERT_HYPERLINKS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_deleteColumns, pTabProtect-isOptionEnabled( ScTableProtection::DELETE_COLUMNS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_deleteRows, pTabProtect-isOptionEnabled( ScTableProtection::DELETE_ROWS ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_selectLockedCells, pTabProtect-isOptionEnabled( ScTableProtection::SELECT_LOCKED_CELLS ) ? XclXmlUtils::ToPsz( true ) : NULL, -XML_sort, pTabProtect-isOptionEnabled( ScTableProtection::SORT ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_autoFilter, pTabProtect-isOptionEnabled( ScTableProtection::AUTOFILTER ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_pivotTables, pTabProtect-isOptionEnabled( ScTableProtection::PIVOT_TABLES ) ? NULL : XclXmlUtils::ToPsz( true ), -XML_selectUnlockedCells, pTabProtect-isOptionEnabled( ScTableProtection::SELECT_UNLOCKED_CELLS ) ? XclXmlUtils::ToPsz( true ) : NULL, +XML_objects, pTabProtect-isOptionEnabled( ScTableProtection::OBJECTS ) ? NULL : XclXmlUtils::ToPsz( true ), +XML_scenarios, pTabProtect-isOptionEnabled( ScTableProtection::SCENARIOS ) ? NULL : XclXmlUtils::ToPsz( true ), +XML_formatCells, pTabProtect-isOptionEnabled( ScTableProtection::FORMAT_CELLS ) ? XclXmlUtils::ToPsz( false ) : NULL, +XML_formatColumns, pTabProtect-isOptionEnabled( ScTableProtection::FORMAT_COLUMNS ) ? XclXmlUtils::ToPsz( false ) : NULL, +XML_formatRows, pTabProtect-isOptionEnabled( ScTableProtection::FORMAT_ROWS ) ?
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 70499, which changed state. Bug 70499 Summary: FILEOPEN Cannot select unprotected cells in XSLX sheet with worksheet protection https://bugs.freedesktop.org/show_bug.cgi?id=70499 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] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d785fa16fdd39b1f78e35b61ba09f65933dee86b
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 13 17:06:37 2013 +0100
warning C4701: potentially uninitialized local variable
Change-Id: I05c5eaf4575dc4b8c8d4e3c45d644a51aab84f0a
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 92a4057..a746dbf 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -563,7 +563,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream
/*rStream*/)
OUString gTarget(aSeq[2].Second);
OUString contentType;
- OOXMLStream::StreamType_t nType;
+ OOXMLStream::StreamType_t nType(OOXMLStream::UNKNOWN);
bool bFound = true;
if(gType.compareTo(sSettingsType) == 0)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig
sc/source/ui/inc/datastreamdlg.hxx |1
sc/source/ui/miscdlgs/datastreamdlg.cxx | 14 -
sc/uiconfig/scalc/ui/datastreams.ui | 347
3 files changed, 185 insertions(+), 177 deletions(-)
New commits:
commit 919c5e4bbeaafc707a668851feef7a4818c40f66
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Dec 13 17:09:42 2013 +0100
datastreams: Improve usability of the dialog.
Change-Id: I6b3f9316c3eb907912aeff1715705a95bbbf547c
diff --git a/sc/source/ui/inc/datastreamdlg.hxx
b/sc/source/ui/inc/datastreamdlg.hxx
index 5bb05f3..162a0d6 100644
--- a/sc/source/ui/inc/datastreamdlg.hxx
+++ b/sc/source/ui/inc/datastreamdlg.hxx
@@ -35,7 +35,6 @@ class DataStreamDlg : public ModalDialog
OKButton* m_pBtnOk;
VclFrame* m_pVclFrameLimit;
VclFrame* m_pVclFrameMove;
-VclFrame* m_pVclFrameRange;
DECL_LINK(UpdateHdl, void *);
DECL_LINK(BrowseHdl, void *);
diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx
b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index 405c7c0..a6d0a92 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -32,7 +32,6 @@ DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, Window*
pParent)
get(m_pBtnOk, ok);
get(m_pVclFrameLimit, framelimit);
get(m_pVclFrameMove, framemove);
-get(m_pVclFrameRange, framerange);
m_pCbUrl-SetSelectHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
m_pRBAddressValue-SetClickHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
@@ -65,16 +64,15 @@ void DataStreamDlg::UpdateEnable()
if (m_pRBAddressValue-IsChecked())
{
m_pRBNoMove-Check();
-m_pVclFrameLimit-Hide();
-m_pVclFrameMove-Hide();
-m_pVclFrameRange-Hide();
-m_pEdRange-SetText();
+m_pVclFrameLimit-Disable();
+m_pVclFrameMove-Disable();
+m_pEdRange-Disable();
}
else
{
-m_pVclFrameLimit-Show();
-m_pVclFrameMove-Show();
-m_pVclFrameRange-Show();
+m_pVclFrameLimit-Enable();
+m_pVclFrameMove-Enable();
+m_pEdRange-Enable();
bOk = bOk !m_pEdRange-GetText().isEmpty();
}
m_pBtnOk-Enable(bOk);
diff --git a/sc/uiconfig/scalc/ui/datastreams.ui
b/sc/uiconfig/scalc/ui/datastreams.ui
index fc2dcea..1c2abe7 100644
--- a/sc/uiconfig/scalc/ui/datastreams.ui
+++ b/sc/uiconfig/scalc/ui/datastreams.ui
@@ -17,6 +17,7 @@
property name=visibleTrue/property
property name=can_focusFalse/property
property name=orientationvertical/property
+property name=spacing6/property
child
object class=GtkFrame id=frame
property name=visibleTrue/property
@@ -45,7 +46,7 @@
object class=GtkLabel id=label6
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=label
translatable=yesURL/property
+property name=label
translatable=yesURL:/property
/object
packing
property name=expandFalse/property
@@ -103,6 +104,7 @@
property name=visibleTrue/property
property name=can_focusFalse/property
property name=orientationvertical/property
+property name=spacing6/property
child
object class=GtkRadioButton id=directdata
property name=label
translatable=yesDirect data feed/property
@@ -156,26 +158,30 @@
property name=top_padding6/property
property name=left_padding12/property
child
- object class=GtkBox id=box2
+ object class=GtkGrid id=grid2
property name=visibleTrue/property
property name=can_focusFalse/property
-property
name=orientationvertical/property
+property name=row_spacing6/property
+property
name=column_spacing6/property
+child
+ placeholder/
+/child
child
object class=GtkRadioButton
id=valuesinline
-property name=label
translatable=yesvalue1,value2,.../property
+property name=label
translatable=yesvalue1,value2,...,valueN, and fill
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source sc/uiconfig
sc/source/ui/inc/datastreamdlg.hxx |1
sc/source/ui/miscdlgs/datastreamdlg.cxx | 14 -
sc/uiconfig/scalc/ui/datastreams.ui | 347
3 files changed, 185 insertions(+), 177 deletions(-)
New commits:
commit 0a3530dedc562d657c406fec8f04520944ce26dd
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Dec 13 17:09:42 2013 +0100
datastreams: Improve usability of the dialog.
Change-Id: I6b3f9316c3eb907912aeff1715705a95bbbf547c
diff --git a/sc/source/ui/inc/datastreamdlg.hxx
b/sc/source/ui/inc/datastreamdlg.hxx
index 5bb05f3..162a0d6 100644
--- a/sc/source/ui/inc/datastreamdlg.hxx
+++ b/sc/source/ui/inc/datastreamdlg.hxx
@@ -35,7 +35,6 @@ class DataStreamDlg : public ModalDialog
OKButton* m_pBtnOk;
VclFrame* m_pVclFrameLimit;
VclFrame* m_pVclFrameMove;
-VclFrame* m_pVclFrameRange;
DECL_LINK(UpdateHdl, void *);
DECL_LINK(BrowseHdl, void *);
diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx
b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index 405c7c0..a6d0a92 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -32,7 +32,6 @@ DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, Window*
pParent)
get(m_pBtnOk, ok);
get(m_pVclFrameLimit, framelimit);
get(m_pVclFrameMove, framemove);
-get(m_pVclFrameRange, framerange);
m_pCbUrl-SetSelectHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
m_pRBAddressValue-SetClickHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
@@ -65,16 +64,15 @@ void DataStreamDlg::UpdateEnable()
if (m_pRBAddressValue-IsChecked())
{
m_pRBNoMove-Check();
-m_pVclFrameLimit-Hide();
-m_pVclFrameMove-Hide();
-m_pVclFrameRange-Hide();
-m_pEdRange-SetText();
+m_pVclFrameLimit-Disable();
+m_pVclFrameMove-Disable();
+m_pEdRange-Disable();
}
else
{
-m_pVclFrameLimit-Show();
-m_pVclFrameMove-Show();
-m_pVclFrameRange-Show();
+m_pVclFrameLimit-Enable();
+m_pVclFrameMove-Enable();
+m_pEdRange-Enable();
bOk = bOk !m_pEdRange-GetText().isEmpty();
}
m_pBtnOk-Enable(bOk);
diff --git a/sc/uiconfig/scalc/ui/datastreams.ui
b/sc/uiconfig/scalc/ui/datastreams.ui
index fc2dcea..1c2abe7 100644
--- a/sc/uiconfig/scalc/ui/datastreams.ui
+++ b/sc/uiconfig/scalc/ui/datastreams.ui
@@ -17,6 +17,7 @@
property name=visibleTrue/property
property name=can_focusFalse/property
property name=orientationvertical/property
+property name=spacing6/property
child
object class=GtkFrame id=frame
property name=visibleTrue/property
@@ -45,7 +46,7 @@
object class=GtkLabel id=label6
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=label
translatable=yesURL/property
+property name=label
translatable=yesURL:/property
/object
packing
property name=expandFalse/property
@@ -103,6 +104,7 @@
property name=visibleTrue/property
property name=can_focusFalse/property
property name=orientationvertical/property
+property name=spacing6/property
child
object class=GtkRadioButton id=directdata
property name=label
translatable=yesDirect data feed/property
@@ -156,26 +158,30 @@
property name=top_padding6/property
property name=left_padding12/property
child
- object class=GtkBox id=box2
+ object class=GtkGrid id=grid2
property name=visibleTrue/property
property name=can_focusFalse/property
-property
name=orientationvertical/property
+property name=row_spacing6/property
+property
name=column_spacing6/property
+child
+ placeholder/
+/child
child
object class=GtkRadioButton
id=valuesinline
-property name=label
translatable=yesvalue1,value2,.../property
+property name=label
translatable=yesvalue1,value2,...,valueN, and fill
[Libreoffice-commits] core.git: sfx2/source sfx2/uiconfig
sfx2/source/dialog/backingwindow.cxx |6 +-
sfx2/uiconfig/ui/startcenter.ui | 29 +++--
2 files changed, 20 insertions(+), 15 deletions(-)
New commits:
commit cabd8725dbd2a1602c6e687788492e5177f5a3e9
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Dec 13 17:41:04 2013 +0100
startcenter: Move the 'Create' under the separator add a colon.
Change-Id: Ie8a1ce8628fa0f31ae6d6a3f1303342c145e33aa
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 8ee2919..f7a66fb 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -59,6 +59,7 @@ const char TEMPLATE_URL[] = slot:5500;
const char OPEN_URL[] = .uno:Open;
const char SERVICENAME_CFGREADACCESS[] =
com.sun.star.configuration.ConfigurationAccess;
+const int nButtonsFontSize = 15;
const Color aButtonsBackground(114, 168, 84); // TDF green
const Color aButtonsText(COL_WHITE);
@@ -234,6 +235,9 @@ void BackingWindow::initControls()
// setup nice colors
mpCreateLabel-SetControlForeground(aButtonsText);
+Font aFont(mpCreateLabel-GetControlFont());
+aFont.SetHeight(nButtonsFontSize);
+mpCreateLabel-SetControlFont(aFont);
mpHelpButton-SetControlForeground(aButtonsText);
mpExtensionsButton-SetControlForeground(aButtonsText);
@@ -261,7 +265,7 @@ void BackingWindow::setupButton( PushButton* pButton )
{
// the buttons should have a bit bigger font
Font aFont(pButton-GetControlFont());
-aFont.SetHeight(15);
+aFont.SetHeight(nButtonsFontSize);
pButton-SetControlFont(aFont);
// color that fits the theme
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index dd175fb..7f60948 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -2,6 +2,11 @@
interface
!-- interface-requires gtk+ 3.0 --
!-- interface-requires LibreOffice 1.0 --
+ object class=GtkImage id=calc_all_image
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixbufres/ods_32_8.png/property
+ /object
object class=GtkBox id=StartCenter
property name=can_focusFalse/property
child
@@ -23,9 +28,10 @@
property name=hexpandTrue/property
property name=vexpandTrue/property
property name=orientationvertical/property
+property name=spacing3/property
child
object class=GtkButton id=open_all
-property name=label translatable=yes_Open/property
+property name=label translatable=yes_Open
File/property
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultTrue/property
@@ -61,13 +67,11 @@
/packing
/child
child
- object class=GtkLabel id=create_label
+ object class=GtkSeparator id=separator1
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=margin_left12/property
-property name=margin_top12/property
-property name=xalign0/property
-property name=label translatable=yesCreate/property
+property name=margin_left6/property
+property name=margin_right6/property
/object
packing
property name=expandFalse/property
@@ -76,11 +80,13 @@
/packing
/child
child
- object class=GtkSeparator id=separator1
+ object class=GtkLabel id=create_label
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=margin_left6/property
-property name=margin_right6/property
+property name=margin_left12/property
+property name=margin_bottom6/property
+property name=xalign0/property
+property name=label
translatable=yesCreate:/property
/object
packing
property name=expandFalse/property
@@ -359,11 +365,6 @@
/packing
/child
/object
- object class=GtkImage id=calc_all_image
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=pixbufres/ods_32_8.png/property
- /object
object class=GtkImage id=database_all_image
property name=visibleTrue/property
property name=can_focusFalse/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source sfx2/uiconfig
sfx2/source/dialog/backingwindow.cxx |6 +-
sfx2/uiconfig/ui/startcenter.ui | 29 +++--
2 files changed, 20 insertions(+), 15 deletions(-)
New commits:
commit f03badfb35e37963412d4e8c28f1d47cc766ac1b
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Dec 13 17:41:04 2013 +0100
startcenter: Move the 'Create' under the separator add a colon.
Change-Id: Ie8a1ce8628fa0f31ae6d6a3f1303342c145e33aa
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 8ee2919..f7a66fb 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -59,6 +59,7 @@ const char TEMPLATE_URL[] = slot:5500;
const char OPEN_URL[] = .uno:Open;
const char SERVICENAME_CFGREADACCESS[] =
com.sun.star.configuration.ConfigurationAccess;
+const int nButtonsFontSize = 15;
const Color aButtonsBackground(114, 168, 84); // TDF green
const Color aButtonsText(COL_WHITE);
@@ -234,6 +235,9 @@ void BackingWindow::initControls()
// setup nice colors
mpCreateLabel-SetControlForeground(aButtonsText);
+Font aFont(mpCreateLabel-GetControlFont());
+aFont.SetHeight(nButtonsFontSize);
+mpCreateLabel-SetControlFont(aFont);
mpHelpButton-SetControlForeground(aButtonsText);
mpExtensionsButton-SetControlForeground(aButtonsText);
@@ -261,7 +265,7 @@ void BackingWindow::setupButton( PushButton* pButton )
{
// the buttons should have a bit bigger font
Font aFont(pButton-GetControlFont());
-aFont.SetHeight(15);
+aFont.SetHeight(nButtonsFontSize);
pButton-SetControlFont(aFont);
// color that fits the theme
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index dd175fb..7f60948 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -2,6 +2,11 @@
interface
!-- interface-requires gtk+ 3.0 --
!-- interface-requires LibreOffice 1.0 --
+ object class=GtkImage id=calc_all_image
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixbufres/ods_32_8.png/property
+ /object
object class=GtkBox id=StartCenter
property name=can_focusFalse/property
child
@@ -23,9 +28,10 @@
property name=hexpandTrue/property
property name=vexpandTrue/property
property name=orientationvertical/property
+property name=spacing3/property
child
object class=GtkButton id=open_all
-property name=label translatable=yes_Open/property
+property name=label translatable=yes_Open
File/property
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultTrue/property
@@ -61,13 +67,11 @@
/packing
/child
child
- object class=GtkLabel id=create_label
+ object class=GtkSeparator id=separator1
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=margin_left12/property
-property name=margin_top12/property
-property name=xalign0/property
-property name=label translatable=yesCreate/property
+property name=margin_left6/property
+property name=margin_right6/property
/object
packing
property name=expandFalse/property
@@ -76,11 +80,13 @@
/packing
/child
child
- object class=GtkSeparator id=separator1
+ object class=GtkLabel id=create_label
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=margin_left6/property
-property name=margin_right6/property
+property name=margin_left12/property
+property name=margin_bottom6/property
+property name=xalign0/property
+property name=label
translatable=yesCreate:/property
/object
packing
property name=expandFalse/property
@@ -359,11 +365,6 @@
/packing
/child
/object
- object class=GtkImage id=calc_all_image
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=pixbufres/ods_32_8.png/property
- /object
object class=GtkImage id=database_all_image
property name=visibleTrue/property
property name=can_focusFalse/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/recentdocsview.hxx|3 ++-
sfx2/source/control/recentdocsview.cxx | 23 ---
sfx2/source/control/templateview.hrc |5 +++--
sfx2/source/control/templateview.src |9 +++--
4 files changed, 28 insertions(+), 12 deletions(-)
New commits:
commit 62a0a37bad348489222b0cbe8254977c369684a1
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Dec 13 18:03:19 2013 +0100
startcenter: The welcome text was too long, split it to 2 lines.
Change-Id: I23d6a4bf8d9c3b2531dd95e4ea293ce7225bf8f1
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index ac52e67..63a067d 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -72,7 +72,8 @@ protected:
longmnItemMaxTextLength;
Image maWelcomeImage;
-OUString maWelcomeText;
+OUString maWelcomeLine1;
+OUString maWelcomeLine2;
};
#endif // INCLUDED_SFX2_RECENTDOCSVIEW_HXX
diff --git a/sfx2/source/control/recentdocsview.cxx
b/sfx2/source/control/recentdocsview.cxx
index afadb04..1b63ba4 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -46,7 +46,8 @@ RecentDocsView::RecentDocsView( Window* pParent )
, mnItemPadding(5)
, mnItemMaxTextLength(30)
, maWelcomeImage(SfxResId(IMG_WELCOME))
-, maWelcomeText(SfxResId(STR_WELCOME))
+, maWelcomeLine1(SfxResId(STR_WELCOME_LINE1))
+, maWelcomeLine2(SfxResId(STR_WELCOME_LINE2))
{
SetStyle(GetStyle() | WB_VSCROLL);
setItemMaxTextLength( mnItemMaxTextLength );
@@ -254,17 +255,25 @@ void RecentDocsView::Paint( const Rectangle aRect )
aNewFont.SetHeight(20);
SetFont(aNewFont);
-long nTextWidth = GetTextWidth(maWelcomeText);
long nTextHeight = GetTextHeight();
+
+long nTextWidth1 = GetTextWidth(maWelcomeLine1);
+long nTextWidth2 = GetTextWidth(maWelcomeLine2);
+
const Size rImgSize = maWelcomeImage.GetSizePixel();
-const Size rScreenSize = GetSizePixel();
-const int nX = (rScreenSize.Width() - rImgSize.Width())/2;
-const int nY = (rScreenSize.Height() - nTextHeight*1.5 -
rImgSize.Height())/2;
+
+const Size rSize = GetSizePixel();
+
+const int nX = (rSize.Width() - rImgSize.Width())/2;
+const int nY = (rSize.Height() - 3 * nTextHeight -
rImgSize.Height())/2;
+
Point aImgPoint(nX, nY);
-Point aStrPoint((rScreenSize.Width() - nTextWidth)/2, nY +
rImgSize.Height() + nTextHeight/2);
+Point aStr1Point((rSize.Width() - nTextWidth1)/2, nY +
rImgSize.Height() + nTextHeight/2);
+Point aStr2Point((rSize.Width() - nTextWidth2)/2, nY +
rImgSize.Height() + nTextHeight + nTextHeight/2);
DrawImage(aImgPoint, rImgSize, maWelcomeImage,
IMAGE_DRAW_SEMITRANSPARENT);
-DrawText(aStrPoint, maWelcomeText);
+DrawText(aStr1Point, maWelcomeLine1);
+DrawText(aStr2Point, maWelcomeLine2);
SetFont(aOldFont);
}
diff --git a/sfx2/source/control/templateview.hrc
b/sfx2/source/control/templateview.hrc
index f0c4dae..e5608c9 100644
--- a/sfx2/source/control/templateview.hrc
+++ b/sfx2/source/control/templateview.hrc
@@ -10,7 +10,8 @@
#define BTN_ALL_TEMPLATES 256
#define CONTROL_BUTTONS 257
#define FT_NAME 258
-#define STR_WELCOME 259
-#define IMG_WELCOME 260
+#define STR_WELCOME_LINE1 259
+#define STR_WELCOME_LINE2 260
+#define IMG_WELCOME 261
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/templateview.src
b/sfx2/source/control/templateview.src
index 3b866bd..49fe015 100644
--- a/sfx2/source/control/templateview.src
+++ b/sfx2/source/control/templateview.src
@@ -23,9 +23,14 @@ FixedText FT_NAME
Size = MAP_APPFONT( 238, 12 );
};
-String STR_WELCOME
+String STR_WELCOME_LINE1
{
-Text [ en-US ] = Welcome to %PRODUCTNAME. Use the sidebar to open or
create a file.;
+Text [ en-US ] = Welcome to %PRODUCTNAME.;
+};
+
+String STR_WELCOME_LINE2
+{
+Text [ en-US ] = Use the sidebar to open or create a file.;
};
Image IMG_WELCOME
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/sfx2 sfx2/source
include/sfx2/recentdocsview.hxx|3 ++-
sfx2/source/control/recentdocsview.cxx | 23 ---
sfx2/source/control/templateview.hrc |5 +++--
sfx2/source/control/templateview.src |9 +++--
4 files changed, 28 insertions(+), 12 deletions(-)
New commits:
commit 83b041f33d1ab84a8a152475b68dfa71deafce42
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Dec 13 18:03:19 2013 +0100
startcenter: The welcome text was too long, split it to 2 lines.
Change-Id: I23d6a4bf8d9c3b2531dd95e4ea293ce7225bf8f1
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index ac52e67..63a067d 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -72,7 +72,8 @@ protected:
longmnItemMaxTextLength;
Image maWelcomeImage;
-OUString maWelcomeText;
+OUString maWelcomeLine1;
+OUString maWelcomeLine2;
};
#endif // INCLUDED_SFX2_RECENTDOCSVIEW_HXX
diff --git a/sfx2/source/control/recentdocsview.cxx
b/sfx2/source/control/recentdocsview.cxx
index afadb04..1b63ba4 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -46,7 +46,8 @@ RecentDocsView::RecentDocsView( Window* pParent )
, mnItemPadding(5)
, mnItemMaxTextLength(30)
, maWelcomeImage(SfxResId(IMG_WELCOME))
-, maWelcomeText(SfxResId(STR_WELCOME))
+, maWelcomeLine1(SfxResId(STR_WELCOME_LINE1))
+, maWelcomeLine2(SfxResId(STR_WELCOME_LINE2))
{
SetStyle(GetStyle() | WB_VSCROLL);
setItemMaxTextLength( mnItemMaxTextLength );
@@ -254,17 +255,25 @@ void RecentDocsView::Paint( const Rectangle aRect )
aNewFont.SetHeight(20);
SetFont(aNewFont);
-long nTextWidth = GetTextWidth(maWelcomeText);
long nTextHeight = GetTextHeight();
+
+long nTextWidth1 = GetTextWidth(maWelcomeLine1);
+long nTextWidth2 = GetTextWidth(maWelcomeLine2);
+
const Size rImgSize = maWelcomeImage.GetSizePixel();
-const Size rScreenSize = GetSizePixel();
-const int nX = (rScreenSize.Width() - rImgSize.Width())/2;
-const int nY = (rScreenSize.Height() - nTextHeight*1.5 -
rImgSize.Height())/2;
+
+const Size rSize = GetSizePixel();
+
+const int nX = (rSize.Width() - rImgSize.Width())/2;
+const int nY = (rSize.Height() - 3 * nTextHeight -
rImgSize.Height())/2;
+
Point aImgPoint(nX, nY);
-Point aStrPoint((rScreenSize.Width() - nTextWidth)/2, nY +
rImgSize.Height() + nTextHeight/2);
+Point aStr1Point((rSize.Width() - nTextWidth1)/2, nY +
rImgSize.Height() + nTextHeight/2);
+Point aStr2Point((rSize.Width() - nTextWidth2)/2, nY +
rImgSize.Height() + nTextHeight + nTextHeight/2);
DrawImage(aImgPoint, rImgSize, maWelcomeImage,
IMAGE_DRAW_SEMITRANSPARENT);
-DrawText(aStrPoint, maWelcomeText);
+DrawText(aStr1Point, maWelcomeLine1);
+DrawText(aStr2Point, maWelcomeLine2);
SetFont(aOldFont);
}
diff --git a/sfx2/source/control/templateview.hrc
b/sfx2/source/control/templateview.hrc
index f0c4dae..e5608c9 100644
--- a/sfx2/source/control/templateview.hrc
+++ b/sfx2/source/control/templateview.hrc
@@ -10,7 +10,8 @@
#define BTN_ALL_TEMPLATES 256
#define CONTROL_BUTTONS 257
#define FT_NAME 258
-#define STR_WELCOME 259
-#define IMG_WELCOME 260
+#define STR_WELCOME_LINE1 259
+#define STR_WELCOME_LINE2 260
+#define IMG_WELCOME 261
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/templateview.src
b/sfx2/source/control/templateview.src
index 3b866bd..49fe015 100644
--- a/sfx2/source/control/templateview.src
+++ b/sfx2/source/control/templateview.src
@@ -23,9 +23,14 @@ FixedText FT_NAME
Size = MAP_APPFONT( 238, 12 );
};
-String STR_WELCOME
+String STR_WELCOME_LINE1
{
-Text [ en-US ] = Welcome to %PRODUCTNAME. Use the sidebar to open or
create a file.;
+Text [ en-US ] = Welcome to %PRODUCTNAME.;
+};
+
+String STR_WELCOME_LINE2
+{
+Text [ en-US ] = Use the sidebar to open or create a file.;
};
Image IMG_WELCOME
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/inc
i18npool/inc/cclass_unicode.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0c0258ae9f7adfe17fc2e357b86006dbb4497ff4
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 13 18:08:48 2013 +0100
cclass_Unicode failed to actually implement XServiceInfo
Change-Id: I823c112bca495eb8997f2dc098e712cd745759c5
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index d5982e0..53e7e37 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -22,7 +22,7 @@
#include com/sun/star/i18n/XNativeNumberSupplier.hpp
#include com/sun/star/i18n/XCharacterClassification.hpp
#include com/sun/star/i18n/XLocaleData4.hpp
-#include cppuhelper/implbase1.hxx
+#include cppuhelper/implbase2.hxx
#include com/sun/star/lang/XServiceInfo.hpp
#define TRANSLITERATION_casemapping
@@ -32,7 +32,7 @@ namespace com { namespace sun { namespace star { namespace
i18n {
typedef sal_uInt32 UPT_FLAG_TYPE;
-class cclass_Unicode : public cppu::WeakImplHelper1 XCharacterClassification
+class cclass_Unicode : public cppu::WeakImplHelper2
XCharacterClassification, css::lang::XServiceInfo
{
public:
cclass_Unicode(const com::sun::star::uno::Reference
com::sun::star::uno::XComponentContext rxContext );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/recentdocsview.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit b790562925f59b3ae74ac8be69c80d935e7ab2c6 Author: Jan Holesovsky ke...@collabora.com Date: Fri Dec 13 18:18:27 2013 +0100 startcenter: A little more space between the picture welcome text. Change-Id: I093fecd1fb5c052c85cf84f131845258a5fd2284 diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 1b63ba4..6c92b45 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -261,15 +261,14 @@ void RecentDocsView::Paint( const Rectangle aRect ) long nTextWidth2 = GetTextWidth(maWelcomeLine2); const Size rImgSize = maWelcomeImage.GetSizePixel(); - const Size rSize = GetSizePixel(); const int nX = (rSize.Width() - rImgSize.Width())/2; const int nY = (rSize.Height() - 3 * nTextHeight - rImgSize.Height())/2; Point aImgPoint(nX, nY); -Point aStr1Point((rSize.Width() - nTextWidth1)/2, nY + rImgSize.Height() + nTextHeight/2); -Point aStr2Point((rSize.Width() - nTextWidth2)/2, nY + rImgSize.Height() + nTextHeight + nTextHeight/2); +Point aStr1Point((rSize.Width() - nTextWidth1)/2, nY + rImgSize.Height() + 0.7 * nTextHeight); +Point aStr2Point((rSize.Width() - nTextWidth2)/2, nY + rImgSize.Height() + 1.7 * nTextHeight); DrawImage(aImgPoint, rImgSize, maWelcomeImage, IMAGE_DRAW_SEMITRANSPARENT); DrawText(aStr1Point, maWelcomeLine1); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source
sfx2/source/control/recentdocsview.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 7f367c016c32678182b4666f98b204de6a6e882f Author: Jan Holesovsky ke...@collabora.com Date: Fri Dec 13 18:18:27 2013 +0100 startcenter: A little more space between the picture welcome text. Change-Id: I093fecd1fb5c052c85cf84f131845258a5fd2284 diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index 1b63ba4..6c92b45 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -261,15 +261,14 @@ void RecentDocsView::Paint( const Rectangle aRect ) long nTextWidth2 = GetTextWidth(maWelcomeLine2); const Size rImgSize = maWelcomeImage.GetSizePixel(); - const Size rSize = GetSizePixel(); const int nX = (rSize.Width() - rImgSize.Width())/2; const int nY = (rSize.Height() - 3 * nTextHeight - rImgSize.Height())/2; Point aImgPoint(nX, nY); -Point aStr1Point((rSize.Width() - nTextWidth1)/2, nY + rImgSize.Height() + nTextHeight/2); -Point aStr2Point((rSize.Width() - nTextWidth2)/2, nY + rImgSize.Height() + nTextHeight + nTextHeight/2); +Point aStr1Point((rSize.Width() - nTextWidth1)/2, nY + rImgSize.Height() + 0.7 * nTextHeight); +Point aStr2Point((rSize.Width() - nTextWidth2)/2, nY + rImgSize.Height() + 1.7 * nTextHeight); DrawImage(aImgPoint, rImgSize, maWelcomeImage, IMAGE_DRAW_SEMITRANSPARENT); DrawText(aStr1Point, maWelcomeLine1); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
registry and extension problems on master 4.3 Linux 64bit
Have there been recent changes to component or extension registration, as I'm seeing this in my master build of today, Linux 64bit : instdir/program/soffice Python exception: class 'AttributeError': 'module' object has no attribute 'writeRegistryInfo', traceback follows /home/Development/libo/core/instdir/program/pythonloader.py:152 in function writeRegistryInfo() [return mod.writeRegistryInfo( self.ctx.ServiceManager, regKey )] warn:desktop.deployment:25026:1:desktop/source/deployment/registry/dp_backend.cxx:683: unexpected RuntimeException class 'AttributeError': 'module' object has no attribute 'writeRegistryInfo', traceback follows /home/Development/libo/core/instdir/program/pythonloader.py:152 in function writeRegistryInfo() [return mod.writeRegistryInfo( self.ctx.ServiceManager, regKey )] warn:configmgr:25045:1:configmgr/source/xcuparser.cxx:173: bad set node prop member in file:///home/Development/libo/core/instdir/program/../program/../user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu5ro02d.tmp/Addons.xcu warn:configmgr:25045:1:configmgr/source/xcuparser.cxx:173: bad set node prop member in file:///home/Development/libo/core/instdir/program/../program/../user/extensions/bundled/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/lu5ro02d.tmp/Addons.xcu Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 72647, which changed state. Bug 72647 Summary: ACCESSIBILITY: Windows UAA Java Accessibility Bridge can not be enabled for AT support following merge of IA2 bridge https://bugs.freedesktop.org/show_bug.cgi?id=72647 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - postprocess/Rdb_services.mk
postprocess/Rdb_services.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit ece20685104a3c0900677c1baa4ec975af7e4bf7 Author: Michael Stahl mst...@redhat.com Date: Fri Dec 13 19:33:25 2013 +0100 fdo#72647: register Java Access Bridge component af0909f1b88a47db1ea0ea53cdac59daee42db0b was incomplete and overlooked one place that needs adjusting to get a working JAB with --enable-ia2. Change-Id: Id5e3582b38140be7f3adbb0ed1c2b3b83c7c3410 diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 6157e25..b72f4abc 100755 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -137,11 +137,11 @@ $(eval $(call gb_Rdb_add_components,services,\ shell/source/win32/simplemail/smplmail \ shell/source/win32/syssh \ vcl/vcl.windows \ + $(if $(ENABLE_JAVA), \ + accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge \ + ) \ $(if $(ENABLE_IA2), \ winaccessibility/source/service/winaccessibility, \ - $(if $(ENABLE_JAVA), \ - accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge \ - ) \ ) \ ) \ $(if $(ENABLE_HEADLESS), \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/graphhelp.cxx | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit b8bb9f219777d33d14103c5bd67c283bd4dafd51
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Dec 13 19:47:26 2013 +0100
thumbnails: Create nice antialiased thumbnails when saving ODF.
Change-Id: I3dc3289b4ac3423b3a5006dbb7ee895bc25ec50a
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 1394297..8e3e8a6 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -314,7 +314,7 @@ sal_Bool GraphicHelper::createThumb_Impl( const
GDIMetaFile rMtf,
Point aBackPosPix;
Rectangle aOverlayRect;
-// calculate addigtional positions and sizes if an overlay image is used
+// calculate additional positions and sizes if an overlay image is used
if ( pOverlay )
{
aFullSize = Size( nMaximumExtent, nMaximumExtent );
@@ -334,11 +334,16 @@ sal_Bool GraphicHelper::createThumb_Impl( const
GDIMetaFile rMtf,
}
// draw image(s) into VDev and get resulting image
-if ( aVDev.SetOutputSizePixel( aFullSize ) )
+// do it 4x larger to be able to scale it down get beautiful antialias
+Size aAntialiasSize(aFullSize.Width() * 4, aFullSize.Height() * 4);
+if (aVDev.SetOutputSizePixel(aAntialiasSize))
{
+// antialias: provide 4x larger size, and then scale down the result
+Size aAntialias(aDrawSize.Width() * 4, aDrawSize.Height() * 4);
+
// draw metafile into VDev
const_cast GDIMetaFile ( rMtf ).WindStart();
-const_cast GDIMetaFile ( rMtf ).Play( aVDev, aBackPosPix,
aDrawSize );
+const_cast GDIMetaFile ( rMtf ).Play( aVDev, aBackPosPix,
aAntialias );
// draw overlay if necessary
if ( pOverlay )
@@ -351,6 +356,9 @@ sal_Bool GraphicHelper::createThumb_Impl( const
GDIMetaFile rMtf,
if ( aBmp.GetBitCount() != 24 )
aBmp.Convert( BMP_CONVERSION_24BIT );
+// downsize, to get the antialiased picture
+aBmp.Scale(aDrawSize, BMP_SCALE_BESTQUALITY);
+
rBmpEx = BitmapEx( aBmp );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source
sfx2/source/doc/graphhelp.cxx | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 4583a3e9b0392f91516603ac8a09f52494e1004f
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Dec 13 19:47:26 2013 +0100
thumbnails: Create nice antialiased thumbnails when saving ODF.
Change-Id: I3dc3289b4ac3423b3a5006dbb7ee895bc25ec50a
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 7598e4f..22ac9ae 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -314,7 +314,7 @@ sal_Bool GraphicHelper::createThumb_Impl( const
GDIMetaFile rMtf,
Point aBackPosPix;
Rectangle aOverlayRect;
-// calculate addigtional positions and sizes if an overlay image is used
+// calculate additional positions and sizes if an overlay image is used
if ( pOverlay )
{
aFullSize = Size( nMaximumExtent, nMaximumExtent );
@@ -334,11 +334,16 @@ sal_Bool GraphicHelper::createThumb_Impl( const
GDIMetaFile rMtf,
}
// draw image(s) into VDev and get resulting image
-if ( aVDev.SetOutputSizePixel( aFullSize ) )
+// do it 4x larger to be able to scale it down get beautiful antialias
+Size aAntialiasSize(aFullSize.Width() * 4, aFullSize.Height() * 4);
+if (aVDev.SetOutputSizePixel(aAntialiasSize))
{
+// antialias: provide 4x larger size, and then scale down the result
+Size aAntialias(aDrawSize.Width() * 4, aDrawSize.Height() * 4);
+
// draw metafile into VDev
const_cast GDIMetaFile ( rMtf ).WindStart();
-const_cast GDIMetaFile ( rMtf ).Play( aVDev, aBackPosPix,
aDrawSize );
+const_cast GDIMetaFile ( rMtf ).Play( aVDev, aBackPosPix,
aAntialias );
// draw overlay if necessary
if ( pOverlay )
@@ -351,6 +356,9 @@ sal_Bool GraphicHelper::createThumb_Impl( const
GDIMetaFile rMtf,
if ( aBmp.GetBitCount() != 24 )
aBmp.Convert( BMP_CONVERSION_24BIT );
+// downsize, to get the antialiased picture
+aBmp.Scale(aDrawSize, BMP_SCALE_BESTQUALITY);
+
rBmpEx = BitmapEx( aBmp );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.m
desktop/Executable_sbase.mk| 11 ++- desktop/Executable_scalc.mk| 11 ++- desktop/Executable_sdraw.mk| 11 ++- desktop/Executable_simpress.mk | 11 ++- desktop/Executable_smath.mk| 11 ++- desktop/Executable_sweb.mk | 11 ++- desktop/Executable_swriter.mk | 11 ++- 7 files changed, 42 insertions(+), 35 deletions(-) New commits: commit e7e6e9ab60cc9475d20eb330817954003f90076f Author: Michael Stahl mst...@redhat.com Date: Thu Dec 12 17:39:50 2013 +0100 Revert fix windows build This reverts commit 45504f9ba8de2a4372193910b2cb9405f1ea896a. The problem that is apparently fixed here is that link.exe is too dumb to pick the right entry-point if the WinMain definition does not come from an object file but a .lib; in that case it apparently defaults to archaic 8-bit WinMain so tell it to use Unicode one with /ENTRY. Conflicts: desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_sweb.mk desktop/Executable_swriter.mk Change-Id: Ib6239eb0fd3d64fd4a292a0d42d65ef75475c389 (cherry picked from commit 07359c242830bcc934d491870cdf5cb70fc26414) diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 77d0c47..9d35f56 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -15,17 +15,18 @@ $(eval $(call gb_Executable_add_defs,sbase,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_ldflags,sbase,\ +/ENTRY:wWinMainCRTStartup \ +)) + $(eval $(call gb_Executable_use_libraries,sbase,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_libs,sbase,\ -$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ +$(eval $(call gb_Executable_use_static_libraries,sbase,\ +winlauncher \ )) -$(call gb_Executable_get_target,sbase) : \ -$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) - $(eval $(call gb_Executable_add_exception_objects,sbase,\ desktop/win32/source/applauncher/sbase \ )) diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 8c8cb42..0a00849 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -15,17 +15,18 @@ $(eval $(call gb_Executable_add_defs,scalc,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_ldflags,scalc,\ +/ENTRY:wWinMainCRTStartup \ +)) + $(eval $(call gb_Executable_use_libraries,scalc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_libs,scalc,\ -$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ +$(eval $(call gb_Executable_use_static_libraries,scalc,\ +winlauncher \ )) -$(call gb_Executable_get_target,scalc) : \ -$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) - $(eval $(call gb_Executable_add_exception_objects,scalc,\ desktop/win32/source/applauncher/scalc \ )) diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index e3a4eef..17f65ec 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -15,17 +15,18 @@ $(eval $(call gb_Executable_add_defs,sdraw,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_ldflags,sdraw,\ +/ENTRY:wWinMainCRTStartup \ +)) + $(eval $(call gb_Executable_use_libraries,sdraw,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_libs,sdraw,\ -$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ +$(eval $(call gb_Executable_use_static_libraries,sdraw,\ +winlauncher \ )) -$(call gb_Executable_get_target,sdraw) : \ -$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) - $(eval $(call gb_Executable_add_exception_objects,sdraw,\ desktop/win32/source/applauncher/sdraw \ )) diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index 4d0648e..d486f57 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -15,17 +15,18 @@ $(eval $(call gb_Executable_add_defs,simpress,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_ldflags,simpress,\ +/ENTRY:wWinMainCRTStartup \ +)) + $(eval $(call gb_Executable_use_libraries,simpress,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_libs,simpress,\ -$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) \ +$(eval $(call gb_Executable_use_static_libraries,simpress,\ +winlauncher \ )) -$(call gb_Executable_get_target,simpress) : \ -$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher) - $(eval $(call gb_Executable_add_exception_objects,simpress,\ desktop/win32/source/applauncher/simpress \ )) diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index 627ceb4..980cc54 100644 ---
[Libreoffice-commits] core.git: 3 commits - sc/source
sc/source/ui/view/tabvwshe.cxx | 46 +++--
1 file changed, 26 insertions(+), 20 deletions(-)
New commits:
commit 71b491fd71f5ad1aa61f917992462009a6d1bb6b
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 13 20:00:49 2013 +0100
const as const can
Change-Id: I0610bdee35fb7a36a183a5617115f3277af8e6a8
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 39ae828..5f08498 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -237,7 +237,7 @@ void ScTabViewShell::ExecSearch( SfxRequest rReq )
ScGlobal::SetSearchItem( *pSearchItem );
sal_Bool bSuccess = SearchAndReplace( pSearchItem,
sal_True, rReq.IsAPI() );
-SfxChildWindow* pChildWindow =
SfxViewFrame::Current()-GetChildWindow(
+const SfxChildWindow* pChildWindow =
SfxViewFrame::Current()-GetChildWindow(
SvxSearchDialogWrapper::GetChildWindowId());
if (pChildWindow)
{
@@ -307,7 +307,7 @@ void ScTabViewShell::ExecSearch( SfxRequest rReq )
rReq.IsAPI() ?
SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON :
SFX_CALLMODE_STANDARD,
aSearchItem, 0L );
-SfxChildWindow* pChildWindow =
SfxViewFrame::Current()-GetChildWindow(
+const SfxChildWindow* pChildWindow =
SfxViewFrame::Current()-GetChildWindow(
SvxSearchDialogWrapper::GetChildWindowId());
if (pChildWindow)
{
commit 6c91431eef31e35e7beb3c1272221d04d60ec2a2
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 13 19:56:38 2013 +0100
maybe better guard against a NULL child window also here
Change-Id: Iad65806894df2454e4341a49f473c308d47660eb
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 58e1159..39ae828 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -307,19 +307,22 @@ void ScTabViewShell::ExecSearch( SfxRequest rReq )
rReq.IsAPI() ?
SFX_CALLMODE_API|SFX_CALLMODE_SYNCHRON :
SFX_CALLMODE_STANDARD,
aSearchItem, 0L );
-SvxSearchDialog* pSearchDlg =
-
((SvxSearchDialog*)(SfxViewFrame::Current()-GetChildWindow(
-
SvxSearchDialogWrapper::GetChildWindowId())-GetWindow()));
-if( pSearchDlg )
+SfxChildWindow* pChildWindow =
SfxViewFrame::Current()-GetChildWindow(
+SvxSearchDialogWrapper::GetChildWindowId());
+if (pChildWindow)
{
-ScTabView* pTabView = GetViewData()-GetView();
-if( pTabView )
+SvxSearchDialog* pSearchDlg =
(SvxSearchDialog*)(pChildWindow-GetWindow());
+if( pSearchDlg )
{
-Window* pWin = pTabView-GetActiveWin();
-if( pWin )
+ScTabView* pTabView = GetViewData()-GetView();
+if( pTabView )
{
-pSearchDlg-SetDocWin( pWin );
-pSearchDlg-SetSrchFlag();
+Window* pWin = pTabView-GetActiveWin();
+if( pWin )
+{
+pSearchDlg-SetDocWin( pWin );
+pSearchDlg-SetSrchFlag();
+}
}
}
}
commit a0fb8a2eb12406b980537ca0190c6ddc33372947
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 13 19:47:59 2013 +0100
fixed crash when searching via Find Text bar
Introduced with b41332475783c31136673fb44cf4c411bb0148f8
Integrate branch of IAccessible2
Find Text bar is not the search dialog, so there is no child window
unless the Find Replace dialog is also open.
Change-Id: Ice230cb2c05534c754fefc55bb8d8b189724d328
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 55f169b..58e1159 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -237,19 +237,22 @@ void ScTabViewShell::ExecSearch( SfxRequest rReq )
ScGlobal::SetSearchItem( *pSearchItem );
sal_Bool bSuccess = SearchAndReplace( pSearchItem,
sal_True, rReq.IsAPI() );
-SvxSearchDialog* pSearchDlg =
-
((SvxSearchDialog*)(SfxViewFrame::Current()-GetChildWindow(
-
[Libreoffice-commits] core.git: 2 commits - chart2/CppunitTest_chart2_export.mk chart2/CppunitTest_chart2_import.mk chart2/qa include/unotest unotest/source
chart2/CppunitTest_chart2_export.mk | 10 +
chart2/CppunitTest_chart2_import.mk |6 -
chart2/qa/extras/chart2export.cxx| 136 ---
chart2/qa/extras/charttest.hxx | 39 ++-
chart2/qa/extras/data/docx/testBarChart.docx |binary
include/unotest/bootstrapfixturebase.hxx |1
include/unotest/macros_test.hxx |2
unotest/source/cpp/bootstrapfixturebase.cxx |5
unotest/source/cpp/macros_test.cxx |6 -
9 files changed, 181 insertions(+), 24 deletions(-)
New commits:
commit 31cba7d34694f50ddf015b405688635b591ce2c0
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Dec 13 17:38:43 2013 +0100
fixes for previous commit
Change-Id: Ic4f2d36ce901b88b47b43fdebba197daf8bd0373
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index d122d8c..2767158 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -49,7 +49,7 @@ protected:
* xml stream, and asserting an XPath expression. This method returns the
* xml stream, so that you can do the asserting.
*/
-xmlDocPtr parseExport(const OUString rStreamName);
+xmlDocPtr parseExport(const OUString rStreamName, const OUString
rFilterFormat);
/**
* Helper method to return nodes represented by rXPath.
@@ -83,11 +83,9 @@ void Chart2ExportTest::test()
reload(Calc Office Open XML);
}
-xmlDocPtr Chart2ExportTest::parseExport(const OUString rStreamName)
+xmlDocPtr Chart2ExportTest::parseExport(const OUString rStreamName, const
OUString rFilterFormat)
{
-if (!m_bExported)
-return 0;
-utl::TempFile aTempFile = reload(Office Open XML Text);
+utl::TempFile aTempFile = reload(rFilterFormat);
// Read the XML stream we're interested in.
uno::Referencepackages::zip::XZipFileAccess2 xNameAccess =
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
aTempFile.GetURL());
@@ -374,7 +372,7 @@ void Chart2ExportTest::testStockChart()
*/
load(/chart2/qa/extras/data/docx/, testStockChart.docx);
-xmlDocPtr pXmlDoc = parseExport(word/charts/chart1.xml);
+xmlDocPtr pXmlDoc = parseExport(word/charts/chart1.xml, Office Open XML
Text);
if (!pXmlDoc)
return;
@@ -386,9 +384,9 @@ void Chart2ExportTest::testStockChart()
void Chart2ExportTest::testBarChart()
{
load(/chart2/qa/extras/data/docx/, testBarChart.docx);
-xmlDocPtr pXmlDoc = parseExport(word/charts/chart1.xml);
+xmlDocPtr pXmlDoc = parseExport(word/charts/chart1.xml, Office Open XML
Text);
if (!pXmlDoc)
-return;
+ return;
assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:barChart/c:barDir, val, col);
}
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index fdabb9c..b50f4fd 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -50,15 +50,10 @@ using namespace com::sun::star::uno;
class ChartTest : public test::BootstrapFixture, public unotest::MacrosTest
{
public:
-ChartTest()
-: mServiceName(),
- m_bExported(false)
-{
-}
-void load( const char* pDir, const char* pName );
-utl::TempFile reload( const OUString rFilterName );
+void load( const OUString rDir, const OUString rFileName );
+utl::TempFile reload( const OUString rFileName );
uno::Sequence OUString getImpressChartColumnDescriptions( const char*
pDir, const char* pName );
-OUString getFileExtension( const char* pName );
+OUString getFileExtension( const OUString rFileName );
void loadDocx(const char* pDir, const char* pName);
utl::TempFile reloadDocx();
@@ -67,29 +62,29 @@ public:
protected:
Reference lang::XComponent mxComponent;
- const char* mServiceName;
-bool m_bExported; /// Does m_aTempFile already contain something useful?
-
+OUString maServiceName;
};
-OUString ChartTest::getFileExtension( const char* pName )
+
+OUString ChartTest::getFileExtension( const OUString aFileName )
{
-OUString fileName = OUString::createFromAscii(pName);
-sal_Int32 dotLocation = fileName.lastIndexOf(L'.');
-return fileName.copy(dotLocation);
+sal_Int32 nDotLocation = aFileName.lastIndexOf('.');
+CPPUNIT_ASSERT(nDotLocation != -1);
+return aFileName.copy(nDotLocation);
}
-void ChartTest::load( const char* pDir, const char* pName )
+
+void ChartTest::load( const OUString aDir, const OUString aName )
{
-OUString extension = getFileExtension(pName);
-if(extension.equals(ods))
+OUString extension = getFileExtension(aName);
+if(extension == ods)
{
-mServiceName = com.sun.star.sheet.SpreadsheetDocument;
+maServiceName = com.sun.star.sheet.SpreadsheetDocument;
}
-else if(extension.equals(docx))
+else if(extension == docx)
{
- mServiceName =
Re: minutes of ESC call ...
hi Stuart, On 12/12/13 18:15, V Stuart Foote wrote: Michael Meeks-5 wrote + decide on whether to remove legacy Java Access Bridge from 4.2 (Michael S) [ decided not to for now, historically good to have old RTF + new RTF filters, so it's easy to try out if new bugs are causd by new code ] note that the decision above is just about not removing the JAB code from 4.2; whether we should by default enable JAB on the 4.2 branch and have IA2 as experimental, or the other way around, is a question that i don't have much of an opinion on; in fact i would want to defer this decision to you since you have the most experience in testing these things (whereas i just click randomly on things in accprobe) and thus have the most informed opinion as to which works best now. also, please give the master builds starting today (or 4.2 builds starting tomorrow) another round of testing with IA2; there is a well-known problem with possible deadlocks that would just hang LO completely, but i'm currently assuming this problem only occurs with remote UNO connections (which ordinary end-users don't have) until i hear otherwise. While probably sound, this is a problem as we seem to have clobbered the Java Access Bridge implementation in the 4.2.0 beta builds after we got IAccessible2 working-- between commits 23 Nov - 25 Nov -- f4ca7b35f580827ad2c69ea6d29f7c9b48ebbac7..12ebbb7e471d851eec940a47e6737c7c89d0f7f8 http://cgit.freedesktop.org/libreoffice/core/log/?h=libreoffice-4-2qt=rangeq=f4ca7b35f580827ad2c69ea6d29f7c9b48ebbac7..12ebbb7e471d851eec940a47e6737c7c89d0f7f8 i'm hoping it was just the simple problem of missing component registration in --enable-ia2 builds, which should be fixed now. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2export.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 637bf4e144b5af6a97832db489f8ad30a9b9938b Author: Tor Lillqvist t...@collabora.com Date: Fri Dec 13 21:21:38 2013 +0200 Remove leftover uncommented comment Change-Id: I5872f884ccc113512d6b5097989aafac6d39b209 diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 2767158..03f9136 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -37,7 +37,7 @@ public: CPPUNIT_TEST(test); CPPUNIT_TEST(testErrorBarXLSX); CPPUNIT_TEST(testTrendline); -CPPUNIT_TEST(testStockChart); disable pending necessary patch from gerrit 6957 +CPPUNIT_TEST(testStockChart); CPPUNIT_TEST(testBarChart); CPPUNIT_TEST_SUITE_END(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2export.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 122d6c5e975cfbc03f55205a33d5d91e4cbc0906 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Dec 13 20:38:21 2013 +0100 improve the error reporting Change-Id: I9a1deacea6499bc0b15e3d9d1a375af299ecf493 diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 03f9136..8536e18 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -90,6 +90,7 @@ xmlDocPtr Chart2ExportTest::parseExport(const OUString rStreamName, const OUStr // Read the XML stream we're interested in. uno::Referencepackages::zip::XZipFileAccess2 xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), aTempFile.GetURL()); uno::Referenceio::XInputStream xInputStream(xNameAccess-getByName(rStreamName), uno::UNO_QUERY); +CPPUNIT_ASSERT(xInputStream.is()); boost::shared_ptrSvStream pStream(utl::UcbStreamHelper::CreateStream(xInputStream, sal_True)); pStream-Seek(STREAM_SEEK_TO_END); sal_Size nSize = pStream-Tell(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/oox oox/source
include/oox/export/chartexport.hxx |2
oox/source/export/chartexport.cxx | 80 +
2 files changed, 58 insertions(+), 24 deletions(-)
New commits:
commit 6483f39e8959050ca4d5df42c27695ae98efa8c9
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Dec 13 20:47:12 2013 +0100
also export hiLowLines for lineChart
Change-Id: I7b96fcb1e537517a80de87d997818d372d03f74a
diff --git a/include/oox/export/chartexport.hxx
b/include/oox/export/chartexport.hxx
index 833b90a..1e6278b 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -130,6 +130,7 @@ private:
void exportScatterChart( com::sun::star::uno::Reference
com::sun::star::chart2::XChartType xChartType );
void exportStockChart( com::sun::star::uno::Reference
com::sun::star::chart2::XChartType xChartType );
void exportSuffaceChart( com::sun::star::uno::Reference
com::sun::star::chart2::XChartType xChartType );
+void exportHiLowLines();
void exportUpDownBars(com::sun::star::uno::Reference
com::sun::star::chart2::XChartType xChartType );
void exportSeries( com::sun::star::uno::Reference
com::sun::star::chart2::XChartType xChartType, sal_Int32 nAttachedAxis );
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index fddaf8e..0c06208 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1246,6 +1246,7 @@ void ChartExport::exportLineChart( Reference
chart2::XChartType xChartType )
if( !mbIs3DChart )
{
+exportHiLowLines();
exportUpDownBars(xChartType);
const char* marker = nSymbolType ==
::com::sun::star::chart::ChartSymbolType::NONE? 0:1;
pFS-singleElement( FSNS( XML_c, XML_marker ),
@@ -1347,15 +1348,7 @@ void ChartExport::exportStockChart( Reference
chart2::XChartType xChartType )
Reference ::com::sun::star::chart::XStatisticDisplay
xStockPropProvider( mxDiagram, uno::UNO_QUERY );
if( xStockPropProvider.is())
{
-// stock-range-line
-Reference beans::XPropertySet xStockPropSet =
xStockPropProvider-getMinMaxLine();
-if( xStockPropSet.is() )
-{
-pFS-startElement( FSNS( XML_c, XML_hiLowLines ),
-FSEND );
-exportShapeProps( xStockPropSet );
-pFS-endElement( FSNS( XML_c, XML_hiLowLines ) );
-}
+exportHiLowLines();
exportUpDownBars(xChartType);
}
@@ -1364,6 +1357,25 @@ void ChartExport::exportStockChart( Reference
chart2::XChartType xChartType )
pFS-endElement( FSNS( XML_c, XML_stockChart ) );
}
+void ChartExport::exportHiLowLines()
+{
+FSHelperPtr pFS = GetFS();
+// export the chart property
+Reference ::com::sun::star::chart::XStatisticDisplay
xChartPropProvider( mxDiagram, uno::UNO_QUERY );
+
+if (!xChartPropProvider.is())
+return;
+
+Reference beans::XPropertySet xStockPropSet =
xChartPropProvider-getMinMaxLine();
+if( xStockPropSet.is() )
+{
+pFS-startElement( FSNS( XML_c, XML_hiLowLines ),
+FSEND );
+exportShapeProps( xStockPropSet );
+pFS-endElement( FSNS( XML_c, XML_hiLowLines ) );
+}
+}
+
void ChartExport::exportUpDownBars( Reference chart2::XChartType xChartType)
{
FSHelperPtr pFS = GetFS();
commit e1ace08771da5b32ed9801d4ee6166c619aae8fa
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Dec 13 20:30:13 2013 +0100
fix an OOXML validation error with the last patch
Change-Id: I1aa1b2675a23b124666fce25807ddf65dfdcb8d5
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 095203f..fddaf8e 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1246,13 +1246,13 @@ void ChartExport::exportLineChart( Reference
chart2::XChartType xChartType )
if( !mbIs3DChart )
{
+exportUpDownBars(xChartType);
const char* marker = nSymbolType ==
::com::sun::star::chart::ChartSymbolType::NONE? 0:1;
pFS-singleElement( FSNS( XML_c, XML_marker ),
XML_val, marker,
FSEND );
}
-exportUpDownBars(xChartType);
exportAxesId( nAttachedAxis );
pFS-endElement( FSNS( XML_c, nTypeId ) );
commit 077213c23e377fd7398b35b88050ac173d22d268
Author: YogeshBharate yogesh.bhar...@synerzip.com
Date: Wed Dec 11 18:01:27 2013 +0530
fdo#72345: Fixed for Charts - Up Down Bars are missing after Round trip
UpDownBars missing after Roundtrip in case of LineChart.
Change-Id: Ia3e574aefb9436a2f5b2b88e8824625d09d35c38
diff --git a/include/oox/export/chartexport.hxx
b/include/oox/export/chartexport.hxx
index 237b410..833b90a 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -130,6 +130,7 @@ private:
void exportScatterChart(
[Libreoffice-commits] core.git: 3 commits - sc/inc sc/source
sc/inc/table.hxx |2 -
sc/source/core/data/table2.cxx |9
sc/source/ui/Accessibility/AccessibleTableBase.cxx | 38 ++---
3 files changed, 26 insertions(+), 23 deletions(-)
New commits:
commit c16ec3067e96fe0a53ae56d118e85dda4831f88b
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 13 21:13:12 2013 +0100
there is no need to expose an ScColumn*, and always check for validity
Change-Id: Id7f4f180083ec61a98cc93dd7c41b66cbac28953
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 1a84fce..f07e8d4 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -1068,8 +1068,6 @@ private:
SCROW mnUBound;
};
-public :
-ScColumn* GetColumnByIndex( sal_Int32 nIndex );
};
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index e4b9ea6..30771ab 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -3654,13 +3654,4 @@ sal_uLong ScTable::GetColOffset( SCCOL nCol, bool
bHiddenAsZero ) const
return n;
}
-ScColumn* ScTable::GetColumnByIndex( sal_Int32 nIndex )
-{
-if (ValidCol(nIndex))
-{
-return (aCol[nIndex]);
-}
-return NULL;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index 9ce33be..9963e34 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -146,12 +146,19 @@ sal_Int32 SAL_CALL
ScAccessibleTableBase::getAccessibleRowExtentAt( sal_Int32 nR
if (mpDoc)
{
-SCROW nEndRow(0);
-SCCOL nEndCol(0);
-mpDoc-FetchTable(maRange.aStart.Tab())-GetColumnByIndex(nColumn)-
-ExtendMerge( static_castSCCOL(nColumn),
static_castSCROW(nRow), nRow, nEndCol, nEndRow, sal_False );
-if (nEndRow nRow)
- nCount = nEndRow - nRow + 1;
+ScTable* pTab = mpDoc-FetchTable(maRange.aStart.Tab());
+if (pTab)
+{
+SCROW nStartRow = static_castSCROW(nRow);
+SCROW nEndRow = nStartRow;
+SCCOL nStartCol = static_castSCCOL(nColumn);
+SCCOL nEndCol = nStartCol;
+if (pTab-ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow,
false))
+{
+if (nEndRow nStartRow)
+nCount = nEndRow - nStartRow + 1;
+}
+}
}
return nCount;
@@ -173,12 +180,19 @@ sal_Int32 SAL_CALL
ScAccessibleTableBase::getAccessibleColumnExtentAt( sal_Int32
if (mpDoc)
{
-SCROW nEndRow(0);
-SCCOL nEndCol(0);
-mpDoc-FetchTable(maRange.aStart.Tab())-GetColumnByIndex(nColumn)-
-ExtendMerge( static_castSCCOL(nColumn),
static_castSCROW(nRow), nRow, nEndCol, nEndRow, sal_False );
-if (nEndCol nColumn)
-nCount = nEndCol - nColumn + 1;
+ScTable* pTab = mpDoc-FetchTable(maRange.aStart.Tab());
+if (pTab)
+{
+SCROW nStartRow = static_castSCROW(nRow);
+SCROW nEndRow = nStartRow;
+SCCOL nStartCol = static_castSCCOL(nColumn);
+SCCOL nEndCol = nStartCol;
+if (pTab-ExtendMerge( nStartCol, nStartRow, nEndCol, nEndRow,
false))
+{
+if (nEndCol nStartCol)
+nCount = nEndCol - nStartCol + 1;
+}
+}
}
return nCount;
commit ffb8b734c0654c3e1d7d2acb01d5ea00400b1b68
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 13 20:18:17 2013 +0100
how about style?
Change-Id: I2b53f87f0bf0838c0ef61c3b31408643ae4a0fc3
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index f29e7f9..1a84fce 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -1069,7 +1069,7 @@ private:
};
public :
-ScColumn* GetColumnByIndex(sal_Int32 index);
+ScColumn* GetColumnByIndex( sal_Int32 nIndex );
};
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index cc7b435..e4b9ea6 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -3654,11 +3654,11 @@ sal_uLong ScTable::GetColOffset( SCCOL nCol, bool
bHiddenAsZero ) const
return n;
}
-ScColumn* ScTable::GetColumnByIndex(sal_Int32 index)
+ScColumn* ScTable::GetColumnByIndex( sal_Int32 nIndex )
{
-if (ValidCol(index))
+if (ValidCol(nIndex))
{
-return (aCol[index]);
+return (aCol[nIndex]);
}
return NULL;
}
commit b51b34ca82411d91e300107b0fca9041ba806366
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 13 20:09:48 2013 +0100
we do have ValidCol(), so use it
Change-Id: I50d39f7022edcf851f299fc3589e43bf95f682b5
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 87e4832..cc7b435 100644
--- a/sc/source/core/data/table2.cxx
+++
[Libreoffice-commits] core.git: external/liborcus
external/liborcus/UnpackedTarball_liborcus.mk |3 +++ external/liborcus/liborcus-handle-invalid-xml.patch.1 | 12 2 files changed, 15 insertions(+) New commits: commit ece94ab98fd8564a5419ea370c0d1f0e6afe188a Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Dec 13 21:06:04 2013 +0100 handle invalid xml files in orcus, fdo#63844 Change-Id: I82fff6ab89acece0e46c92bfca2c7faf967639b8 diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 9e2df47..930543c 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -21,6 +21,9 @@ liborcus_patches += liborcus_0.1.0-configure.patch # don't use dllimport liborcus_patches += liborcus_0.1.0-dllimport.patch +# fdo#63844 +liborcus_patches += liborcus-handle-invalid-xml.patch.1 + ifeq ($(OS),MACOSX) # no tac command on OS X, but tail -r liborcus_patches += liborcus_0.1.0-tac.patch diff --git a/external/liborcus/liborcus-handle-invalid-xml.patch.1 b/external/liborcus/liborcus-handle-invalid-xml.patch.1 new file mode 100644 index 000..4cb091d --- /dev/null +++ b/external/liborcus/liborcus-handle-invalid-xml.patch.1 @@ -0,0 +1,12 @@ +diff -ur liborcus.org/include/orcus/sax_parser.hpp liborcus/include/orcus/sax_parser.hpp +--- liborcus.org/include/orcus/sax_parser.hpp 2013-12-13 20:51:55.126503773 +0100 liborcus/include/orcus/sax_parser.hpp 2013-12-13 20:57:39.076174743 +0100 +@@ -278,6 +278,8 @@ + special_tag(); + break; + default: ++if (!is_alpha(c)) ++throw malformed_xml_error(expect an alphabet.); + element_open(pos); + } + } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: l10n process, en_US version, Help files
Hi Sophie Le Fri, 13 Dec 2013 10:01:05 +0100, Sophie gautier.sop...@gmail.com a écrit: Hi Mat, Le 12/12/2013 22:56, Mat M a écrit : Hi all My grain of salt there. I strongly believe we need to cross-talk, so I go on cross-posting. Thanks a lot for your input, jumping to my question: [...] * And... fixing ! Easy hacks or l10n sessions to fix that are both valid choices. We may want to automate finding occurrences of text in the code. We began with fdo#39439, but further steps are required. did you submit your work, is it now integrated? I already sent the first draft to Michael Meeks, but we have to find a server to host it. So submitted but not integrated. Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 72650, which changed state. Bug 72650 Summary: Startup is slow due to the new startcenter if opened before a remote file https://bugs.freedesktop.org/show_bug.cgi?id=72650 What|Removed |Added Status|UNCONFIRMED |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: [PATCH] HiDPI fixes for squiggly underlines
Hi Kendy, Good to hear from you. I've got a number of things in progress on my computer beyond the underlines ( https://wiki.documentfoundation.org/Development/HiDpi) but I wait to get an API first as I'm just writing if (1) //hidpi. I personally don't think a floating point value is a good idea. At the lowest level, pixel line widths go to 2 or 3 and in the square case go to 4 or 9. I believe anything who wants more resolution should probably be working based on the system font size. The changes I'm making don't seem to need more than 3 and even 2 is plenty for all laptops today and into the distant future. Floating point arithmetic used to be a lot slower than integer as well but I don't know if that is still true ;-) I hope it is okay if I can write code that handles the 2x case but has no guarantees about any other value. I can't test what I can't see and there is a fair amount of work to get LibreOffice looking good and supporting variable-sized bitmaps at all. So if it were up to me, I'd just make it a boolean for a while, and focus / force that part to look great everywhere. Then when you were ready to further generalize it, the compiler would make you to validate all the areas. I even have been taking advantage of the simplicity. I found some arrow drawing logic that wanted an odd-sized height for best results. And so I just doubled it and subtracted one ;-) My biggest concern wrt the API is that it has the right value out of the box. For example, what do normal Macs return for the system font size versus Retinas? What about on Windows? There is plenty of intelligence that can go into a bit. Putting the change in ImplDrawWaveLine is possible. My change is safer in that it mostly only touches the spelling / grammar which is the most noticeable issue. With ImplDrawWaveLine you have to worry about more callers, printers, etc. and possibilities for dirt on screen. I wouldn't necessarily recommend shifting down 2 pixels for the low-level drawing code, so maybe you'd still have to have changes in both places. ImplDrawWaveLine is a routine takes a pixel line width as input, so perhaps the policy decision should be above it. It seems sort of like putting the bitmap doubling logic into the BitBlt routine versus in the toolbar which loads the bitmaps. I could look at the wavy underline character property logic, but I think it is low priority and still might not change the ImplDrawWaveLine. I haven't looked into it. I'm happy to fix any bugs in my simple code, but get concerned about suggestions that complicate it ;-) Working on this early next week would be great. I've got about 600 more lines in 14 files to review that make a difference. There is a fair amount of low-hanging fruit. I am possibly stuck on two issues, but I plug away on it as I have free time. The hardest part is finding the actual line of code that have the bug. With my work, they are being marked which makes future work easier. I did see code that is possibly problematic in places like DecoView but I'm just focusing on the visible ones. Toolbar bitmaps are the most important. The Sidebar is the most broken. Do you think they will fix it? Anyway, I look forward to working through the issues soon because I have some time now and hopefully getting this into 4.2. -Keith ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - writerfilter/CustomTarget_source.mk writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/source
writerfilter/CustomTarget_source.mk |7
writerfilter/Library_writerfilter.mk |2
writerfilter/inc/doctok/WW8Document.hxx | 101 --
writerfilter/source/doctok/WW8CpAndFc.cxx| 84 -
writerfilter/source/doctok/WW8CpAndFc.hxx| 245 ---
writerfilter/source/doctok/WW8FKP.hxx| 122 ---
writerfilter/source/doctok/resourcesimpl.xsl | 414 ---
writerfilter/source/filter/ImportFilter.cxx |1
8 files changed, 976 deletions(-)
New commits:
commit 148e7763f3b3b5eb881026228f8c40b1e179d79d
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Dec 13 22:10:26 2013 +0100
writerfilter: remove unused WW8Stream
Change-Id: I375b4768bc4474f78f6857176c8b77856609aeaa
diff --git a/writerfilter/inc/doctok/WW8Document.hxx
b/writerfilter/inc/doctok/WW8Document.hxx
deleted file mode 100644
index 0f017ac..000
--- a/writerfilter/inc/doctok/WW8Document.hxx
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_WW8_DOCUMENT_HXX
-#define INCLUDED_WW8_DOCUMENT_HXX
-
-#include boost/shared_ptr.hpp
-#include sal/types.h
-#include com/sun/star/uno/Reference.hxx
-#include resourcemodel/SubSequence.hxx
-#include com/sun/star/io/XInputStream.hpp
-#include com/sun/star/uno/XComponentContext.hpp
-
-#include resourcemodel/WW8ResourceModel.hxx
-#include resourcemodel/OutputWithDepth.hxx
-
-#include WriterFilterDllApi.hxx
-
-namespace writerfilter {
-namespace doctok {
-
-using namespace ::com::sun::star;
-
-/**
- A stream containing a WW8 document.
-
- The content of the stream is a sequence of unsigned bytes. The
- stream consists of substreams that are identified by string
- identifiers.
-*/
-class WW8Stream
-{
-public:
-/**
- Pointer to a WW8Stream.
-*/
-typedef boost::shared_ptrWW8Stream Pointer_t;
-
-/**
- Type for the content of the stream
- */
-typedef SubSequencesal_uInt8 Sequence;
-
-virtual ~WW8Stream();
-
-/**
- Returns pointer to a substream.
-
- @param rSid identifier of substream to return
-
- @returnthe substream
- */
-virtual Pointer_t getSubStream(const OUString rSid) = 0;
-
-/**
- Return a continious part of the stream.
-
- @param nOffset offset in the stream where the part starts
- @param nCount length of the part (number of bytes)
-
- @returnsequence of unsigned bytes
- */
-virtual Sequence get(sal_uInt32 nOffset, sal_uInt32 nCount)
-const = 0;
-
-// Returns the names of substreams contained in the stream
-virtual string getSubStreamNames() const = 0;
-
-virtual uno::SequenceOUString getSubStreamUNames() const = 0;
-
-/**
- Dumps content of stream to output.
-
- @param o the target output
-*/
-virtual void dump(OutputWithDepthstring o) const = 0;
-
-//virtual bool put(sal_uInt32 nOffset, const Sequence rSeq) = 0;
-};
-
-}}
-
-#endif // INCLUDED_WW8_DOCUMENT_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/filter/ImportFilter.cxx
b/writerfilter/source/filter/ImportFilter.cxx
index 843e37a..90c4c98 100644
--- a/writerfilter/source/filter/ImportFilter.cxx
+++ b/writerfilter/source/filter/ImportFilter.cxx
@@ -28,7 +28,6 @@
#include oox/core/filterdetect.hxx
#include dmapper/DomainMapper.hxx
#include WriterFilter.hxx
-#include doctok/WW8Document.hxx
#include ooxml/OOXMLDocument.hxx
#ifdef DEBUG_IMPORT
#include iostream
commit 641dac98cddc63304e374a43c299d62b9dff52c9
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Dec 13 22:05:57 2013 +0100
writerfilter: remove unused WW8CpAndFc
Change-Id: I3e56a41c6fe5fab3e16d8e09a5404d83f5477738
diff --git a/writerfilter/Library_writerfilter.mk
b/writerfilter/Library_writerfilter.mk
index 0a56e9c..796c37a 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -122,7 +122,6 @@ $(eval $(call
gb_Library_add_exception_objects,writerfilter,\
Re: [PATCH] HiDPI fixes for squiggly underlines
Hi, On Fri, Dec 13, 2013 at 9:58 PM, Keith Curtis keit...@gmail.com wrote: Hi Kendy, Good to hear from you. I've got a number of things in progress on my computer beyond the underlines (https://wiki.documentfoundation.org/Development/HiDpi) but I wait to get an API first as I'm just writing if (1) //hidpi. I personally don't think a floating point value is a good idea. At the lowest level, pixel line widths go to 2 or 3 and in the square case go to 4 or 9. I believe anything who wants more resolution should probably be working based on the system font size. The changes I'm making don't seem to need more than 3 and even 2 is plenty for all laptops today and into the distant future. Floating point arithmetic used to be a lot slower than integer as well but I don't know if that is still true ;-) I hope it is okay if I can write code that handles the 2x case but has no guarantees about any other value. I can't test what I can't see and there is a fair amount of work to get LibreOffice looking good and supporting variable-sized bitmaps at all. So if it were up to me, I'd just make it a boolean for a while, and focus / force that part to look great everywhere. Then when you were ready to further generalize it, the compiler would make you to validate all the areas. I even have been taking advantage of the simplicity. I found some arrow drawing logic that wanted an odd-sized height for best results. And so I just doubled it and subtracted one ;-) My biggest concern wrt the API is that it has the right value out of the box. For example, what do normal Macs return for the system font size versus Retinas? What about on Windows? There is plenty of intelligence that can go into a bit. Putting the change in ImplDrawWaveLine is possible. My change is safer in that it mostly only touches the spelling / grammar which is the most noticeable issue. With ImplDrawWaveLine you have to worry about more callers, printers, etc. and possibilities for dirt on screen. I wouldn't necessarily recommend shifting down 2 pixels for the low-level drawing code, so maybe you'd still have to have changes in both places. ImplDrawWaveLine is a routine takes a pixel line width as input, so perhaps the policy decision should be above it. It seems sort of like putting the bitmap doubling logic into the BitBlt routine versus in the toolbar which loads the bitmaps. I could look at the wavy underline character property logic, but I think it is low priority and still might not change the ImplDrawWaveLine. I haven't looked into it. I'm happy to fix any bugs in my simple code, but get concerned about suggestions that complicate it ;-) Working on this early next week would be great. I've got about 600 more lines in 14 files to review that make a difference. There is a fair amount of low-hanging fruit. I am possibly stuck on two issues, but I plug away on it as I have free time. The hardest part is finding the actual line of code that have the bug. With my work, they are being marked which makes future work easier. I did see code that is possibly problematic in places like DecoView but I'm just focusing on the visible ones. Toolbar bitmaps are the most important. The Sidebar is the most broken. Do you think they will fix it? Anyway, I look forward to working through the issues soon because I have some time now and hopefully getting this into 4.2. -Keith Great work. But IMHO this doesn't really solve the problem - or at least I think this approach is not correct for canvas elements like wave lines. Everything drawn on canvas should be defined in absolute units (100th mm or similar) and not pixels. If I set the width of a wave line to 2 mm I expect that when the monitor DPI = system DPI and the zoom level is 100%, that I can take the ruler and measure the wave line width to be exactly 2 mm (and 4 mm at zoom 200%, 8 mm at zoom 400%, ...). This must be true for all elements on the canvas at least (for toolbars and non canvas elements IMHO the same rule should apply but this requires then a resolution independent backend). Regards, Tomaž ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/accdoc.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 7efdb77f53a5b499bc58f20ce9b146d7e47cda92
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 13 22:10:17 2013 +0100
sw: SwAccessibleDocument: fix crashes
Add missing SolarMutexGuards and also GetMap() may be 0 if it's
disposed. (regression from 76c549eb01dcb7b5bf28a271ce00e386f3d388ba)
Change-Id: I65312098e3d4cc6f686c3fc9e05dc8a6c4da34ce
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 1d49da2..04eaaaf 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -206,8 +206,10 @@ OUString SAL_CALL
SwAccessibleDocumentBase::getAccessibleDescription (void)
OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleName (void)
throw (::com::sun::star::uno::RuntimeException)
{
+SolarMutexGuard g;
+
OUString sAccName = GetResource( STR_ACCESS_DOC_WORDPROCESSING );
-SwDoc *pDoc = GetShell()-GetDoc();
+SwDoc *pDoc = GetMap() ? GetShell()-GetDoc() : 0;
if ( pDoc )
{
OUString sFileName = pDoc-getDocAccTitle();
@@ -571,6 +573,8 @@ void SwAccessibleDocument::deselectAccessibleChild(
void SAL_CALL SwAccessibleDocument::notifyEvent( const
::com::sun::star::document::EventObject Event )
throw (::com::sun::star::uno::RuntimeException)
{
+SolarMutexGuard g;
+
if ( Event.EventName.equalsAscii( FirstPageShows ) )
{
FireStateChangedEvent( AccessibleStateType::FOCUSED,sal_True );
@@ -602,8 +606,10 @@ void SAL_CALL SwAccessibleDocument::disposing( const
::com::sun::star::lang::Eve
uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException)
{
+SolarMutexGuard g;
+
uno::Any anyAtrribute;
-SwDoc *pDoc = GetShell()-GetDoc();
+SwDoc *pDoc = GetMap() ? GetShell()-GetDoc() : 0;
if (!pDoc)
return anyAtrribute;
@@ -851,6 +857,8 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
SAL_CALL SwAccessibleDocument::get_AccFlowTo(const
::com::sun::star::uno::Any rAny, sal_Int32 nType)
throw ( ::com::sun::star::uno::RuntimeException )
{
+SolarMutexGuard g;
+
const sal_Int32 FORSPELLCHECKFLOWTO = 1;
const sal_Int32 FORFINDREPLACEFLOWTO = 2;
SwAccessibleMap* pAccMap = GetMap();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa
chart2/qa/extras/chart2export.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 14fb96bb488e3ed1d73910a5d37f893fa12e2dca Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Dec 13 22:58:24 2013 +0100 disable tests for now Change-Id: I4f71d05bdfa1e7668bb1410c4b0a735a9c451d89 diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 8536e18..6c0f549 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -37,8 +37,8 @@ public: CPPUNIT_TEST(test); CPPUNIT_TEST(testErrorBarXLSX); CPPUNIT_TEST(testTrendline); -CPPUNIT_TEST(testStockChart); -CPPUNIT_TEST(testBarChart); +//CPPUNIT_TEST(testStockChart); +//CPPUNIT_TEST(testBarChart); CPPUNIT_TEST_SUITE_END(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/text/txtfldi.cxx |2 +-
xmloff/source/text/txtimp.cxx |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 1379294741ff85d4c09d9ded7579ad50dea88fb7
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 13 23:05:06 2013 +0100
fdo#72697 accept future loext:sender-initials
... of to-be text:sender-initials
Change-Id: Ia601c0debc5d66682aa92e14fb063395f9f48ab5
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index e1a82df..0369b42 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -3638,7 +3638,7 @@ SvXMLImportContext*
XMLAnnotationImportContext::CreateChildContext(
pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,
rLocalName, aDateBuffer);
}
-else if( XML_NAMESPACE_TEXT == nPrefix )
+else if( XML_NAMESPACE_TEXT == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix )
{
if( IsXMLToken( rLocalName, XML_SENDER_INITIALS ) )
pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index c6f43f6..1809197 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -151,7 +151,8 @@ static const SvXMLTokenMapEntry aTextPElemTokenMap[] =
// sender fields
{ XML_NAMESPACE_TEXT, XML_SENDER_FIRSTNAME,XML_TOK_TEXT_SENDER_FIRSTNAME},
{ XML_NAMESPACE_TEXT, XML_SENDER_LASTNAME, XML_TOK_TEXT_SENDER_LASTNAME },
-{ XML_NAMESPACE_TEXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS },
+{ XML_NAMESPACE_LO_EXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS
},
+{ XML_NAMESPACE_TEXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS
},
{ XML_NAMESPACE_TEXT, XML_SENDER_TITLE, XML_TOK_TEXT_SENDER_TITLE },
{ XML_NAMESPACE_TEXT, XML_SENDER_POSITION, XML_TOK_TEXT_SENDER_POSITION },
{ XML_NAMESPACE_TEXT, XML_SENDER_EMAIL, XML_TOK_TEXT_SENDER_EMAIL },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - xmloff/source
xmloff/source/text/txtfldi.cxx |2 +-
xmloff/source/text/txtimp.cxx |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit be63a5d34d4659b2fb8341a6e662b926e9d7f852
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 13 23:05:06 2013 +0100
fdo#72697 accept future loext:sender-initials
... of to-be text:sender-initials
Change-Id: Ia601c0debc5d66682aa92e14fb063395f9f48ab5
(cherry picked from commit 1379294741ff85d4c09d9ded7579ad50dea88fb7)
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index bea669e..73aa7aa 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -3658,7 +3658,7 @@ SvXMLImportContext*
XMLAnnotationImportContext::CreateChildContext(
pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,
rLocalName, aDateBuffer);
}
-else if( XML_NAMESPACE_TEXT == nPrefix )
+else if( XML_NAMESPACE_TEXT == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix )
{
if( IsXMLToken( rLocalName, XML_SENDER_INITIALS ) )
pContext = new XMLStringBufferImportContext(GetImport(), nPrefix,
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index ff88ffc..192013e 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -154,7 +154,8 @@ static const SvXMLTokenMapEntry aTextPElemTokenMap[] =
// sender fields
{ XML_NAMESPACE_TEXT, XML_SENDER_FIRSTNAME,XML_TOK_TEXT_SENDER_FIRSTNAME},
{ XML_NAMESPACE_TEXT, XML_SENDER_LASTNAME, XML_TOK_TEXT_SENDER_LASTNAME },
-{ XML_NAMESPACE_TEXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS },
+{ XML_NAMESPACE_LO_EXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS
},
+{ XML_NAMESPACE_TEXT, XML_SENDER_INITIALS, XML_TOK_TEXT_SENDER_INITIALS
},
{ XML_NAMESPACE_TEXT, XML_SENDER_TITLE, XML_TOK_TEXT_SENDER_TITLE },
{ XML_NAMESPACE_TEXT, XML_SENDER_POSITION, XML_TOK_TEXT_SENDER_POSITION },
{ XML_NAMESPACE_TEXT, XML_SENDER_EMAIL, XML_TOK_TEXT_SENDER_EMAIL },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/text/txtflde.cxx | 20 +++-
1 file changed, 15 insertions(+), 5 deletions(-)
New commits:
commit 5f8476c00f482ab5c8707de2ebdcd41faa4057fc
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 13 23:21:46 2013 +0100
fdo#72697 write loext:sender-initials
Change-Id: I032bd79aa3ab73889a3ca723fba56ec371a28231
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 0d43008..63f5cc9 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1756,7 +1756,7 @@ void XMLTextFieldExport::ExportFieldHelper(
OUString aInitials( GetStringProperty(sPropertyInitials, rPropSet) );
if( !aInitials.isEmpty() )
{
-SvXMLElementExport aCreatorElem( GetExport(), XML_NAMESPACE_TEXT,
+SvXMLElementExport aCreatorElem( GetExport(), XML_NAMESPACE_LO_EXT,
XML_SENDER_INITIALS, sal_True,
sal_False );
GetExport().Characters(aInitials);
@@ -2226,10 +2226,20 @@ void XMLTextFieldExport::ExportElement(enum
XMLTokenEnum eElementName,
if (eElementName != XML_TOKEN_INVALID)
{
// Element
-SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
- eElementName, bAddSpace, bAddSpace );
-// export content
-GetExport().Characters(sContent);
+if (eElementName == XML_SENDER_INITIALS)
+{
+SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_LO_EXT,
+ eElementName, bAddSpace, bAddSpace );
+// export content
+GetExport().Characters(sContent);
+}
+else
+{
+SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
+ eElementName, bAddSpace, bAddSpace );
+// export content
+GetExport().Characters(sContent);
+}
} else {
// always export content
GetExport().Characters(sContent);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - external/liborcus
external/liborcus/UnpackedTarball_liborcus.mk |3 +++ external/liborcus/liborcus-handle-invalid-xml.patch.1 | 12 2 files changed, 15 insertions(+) New commits: commit 86815707be317b8b874b0c595bb586b15f7196d4 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Dec 13 21:06:04 2013 +0100 handle invalid xml files in orcus, fdo#63844 Change-Id: I82fff6ab89acece0e46c92bfca2c7faf967639b8 Signed-off-by: Kohei Yoshida kohei.yosh...@collabora.com diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 9e2df47..930543c 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -21,6 +21,9 @@ liborcus_patches += liborcus_0.1.0-configure.patch # don't use dllimport liborcus_patches += liborcus_0.1.0-dllimport.patch +# fdo#63844 +liborcus_patches += liborcus-handle-invalid-xml.patch.1 + ifeq ($(OS),MACOSX) # no tac command on OS X, but tail -r liborcus_patches += liborcus_0.1.0-tac.patch diff --git a/external/liborcus/liborcus-handle-invalid-xml.patch.1 b/external/liborcus/liborcus-handle-invalid-xml.patch.1 new file mode 100644 index 000..4cb091d --- /dev/null +++ b/external/liborcus/liborcus-handle-invalid-xml.patch.1 @@ -0,0 +1,12 @@ +diff -ur liborcus.org/include/orcus/sax_parser.hpp liborcus/include/orcus/sax_parser.hpp +--- liborcus.org/include/orcus/sax_parser.hpp 2013-12-13 20:51:55.126503773 +0100 liborcus/include/orcus/sax_parser.hpp 2013-12-13 20:57:39.076174743 +0100 +@@ -278,6 +278,8 @@ + special_tag(); + break; + default: ++if (!is_alpha(c)) ++throw malformed_xml_error(expect an alphabet.); + element_open(pos); + } + } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - cppuhelper/source extensions/source sd/source svx/source sw/source
cppuhelper/source/unourl.cxx |2 +-
extensions/source/abpilot/fieldmappingpage.cxx|2 +-
sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx |2 +-
svx/source/accessibility/AccessibleShape.cxx |2 +-
svx/source/fmcomp/gridctrl.cxx|2 +-
svx/source/table/accessibletableshape.cxx |2 +-
svx/source/table/svdotable.cxx|2 +-
sw/source/core/access/accdoc.cxx |2 +-
sw/source/filter/ww8/docxattributeoutput.cxx |4 ++--
sw/source/filter/ww8/ww8par3.cxx |2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit b4a4e51641273c6bd3dd271389e9dd31f7dacac0
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 13 23:28:31 2013 +0100
cppcheck: fix rTwo.GetPoolHlpFileId() == rTwo.GetPoolHlpFileId()
Change-Id: I2af19d62bb14af52ce8c2fc6b5d65ad97d910a6d
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 0cdc6bd..82962db 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1501,7 +1501,7 @@ bool IsEqualFormatting(const SwNumRule rOne, const
SwNumRule rTwo)
rOne.IsAbsSpaces() == rTwo.IsAbsSpaces()
rOne.GetPoolFmtId() == rTwo.GetPoolFmtId()
rOne.GetPoolHelpId() == rTwo.GetPoolHelpId()
- rTwo.GetPoolHlpFileId() == rTwo.GetPoolHlpFileId()
+ rOne.GetPoolHlpFileId() == rTwo.GetPoolHlpFileId()
);
if (bRet)
commit 4bb39ccf53be222190c4a52e2db05526b847b16f
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 13 23:22:52 2013 +0100
cppcheck: fix same expression, check once !mxTable.is()
Change-Id: Ie12146f3c2f18c5ec9a49a666f327772493fcf03
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 9009aa6..068a655 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -355,7 +355,7 @@ void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/,
SdrModel* pNewModel)
bool SdrTableObjImpl::ApplyCellStyles()
{
-if( !mxTable.is() || !mxTable.is() || !mxTableStyle.is() )
+if( !mxTable.is() || !mxTableStyle.is() )
return false;
bool bChanges = false;
commit 332a317ea5d1f5a36a74c83fb4b0bc1632f8c252
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 13 23:10:39 2013 +0100
cppcheck: fix same expression, ')' = 29 not 28 in ascii'
Change-Id: I90e22a5532f59b190c59d267256b5e889e82da74
diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx
index a9aa133..9561aeba 100644
--- a/cppuhelper/source/unourl.cxx
+++ b/cppuhelper/source/unourl.cxx
@@ -239,7 +239,7 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString
const rUrl)
sal_Unicode c = rUrl[j];
if (!isAlphanum(c) c != 0x21 c != 0x24 // '!', '$'
c != 0x26 c != 0x27 c != 0x28 // '', ''', '('
- c != 0x28 c != 0x2A c != 0x2B // ')', '*', '+'
+ c != 0x29 c != 0x2A c != 0x2B // ')', '*', '+'
c != 0x2C c != 0x2D c != 0x2E // ',', '-', '.'
c != 0x2F c != 0x3A c != 0x3D // '/', ':', '='
c != 0x3F c != 0x40 c != 0x5F // '?', '@', '_'
commit 9b9c5a318abeaeeafb76ba7fcd09f350740f8ef3
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 13 22:46:44 2013 +0100
cppcheck: Possible inefficient checking
Change-Id: I0d9f1eadb6dc863f1e5606ef2d166881e6cf6c0a
diff --git a/extensions/source/abpilot/fieldmappingpage.cxx
b/extensions/source/abpilot/fieldmappingpage.cxx
index 8776d5d..b33c15f 100644
--- a/extensions/source/abpilot/fieldmappingpage.cxx
+++ b/extensions/source/abpilot/fieldmappingpage.cxx
@@ -81,7 +81,7 @@ namespace abp
{
const AddressSettings rSettings = getSettings();
OUString sHint;
-if ( 0 == rSettings.aFieldMapping.size() )
+if ( rSettings.aFieldMapping.empty() )
sHint = ModuleRes(RID_STR_NOFIELDSASSIGNED).toString();
m_aHint.SetText( sHint );
}
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 957d7b4..789dc5f 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -3532,7 +3532,7 @@ void DbGridControl::DisconnectFromFields()
return;
ColumnFieldValueListeners* pListeners =
(ColumnFieldValueListeners*)m_pFieldListeners;
-while (pListeners-size())
+while (!pListeners-empty())
{
#ifdef DBG_UTIL
sal_Int32 nOldSize = pListeners-size();
commit 55edb3faf6212739d583889b692f802c4bf29467
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 13 22:37:06 2013 +0100
cppcheck: Prefer prefix ++/-- operators for non-primitive types
Change-Id: Ibc34750a0f9b5a36c8fa0743e9ac88482ccfecc4
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/text/txtflde.cxx | 28 +---
1 file changed, 17 insertions(+), 11 deletions(-)
New commits:
commit 49f9694e34d07468cff4a7e4de332f11be3e0dd8
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 13 23:30:34 2013 +0100
fdo#72697 actually write this only in ODF 1.2 extended
Change-Id: I32097cc4b8a67615b0b6d6172cafd0edad7469b6
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 63f5cc9..6f476c4 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1752,14 +1752,17 @@ void XMLTextFieldExport::ExportFieldHelper(
GetExport().Characters(aBuffer.makeStringAndClear());
}
-// initials
-OUString aInitials( GetStringProperty(sPropertyInitials, rPropSet) );
-if( !aInitials.isEmpty() )
+if (SvtSaveOptions().GetODFDefaultVersion()
SvtSaveOptions::ODFVER_012)
{
-SvXMLElementExport aCreatorElem( GetExport(), XML_NAMESPACE_LO_EXT,
- XML_SENDER_INITIALS, sal_True,
- sal_False );
-GetExport().Characters(aInitials);
+// initials
+OUString aInitials( GetStringProperty(sPropertyInitials, rPropSet)
);
+if( !aInitials.isEmpty() )
+{
+SvXMLElementExport aCreatorElem( GetExport(),
XML_NAMESPACE_LO_EXT,
+XML_SENDER_INITIALS, sal_True,
+sal_False );
+GetExport().Characters(aInitials);
+}
}
com::sun::star::uno::Reference com::sun::star::text::XText xText;
@@ -2228,10 +2231,13 @@ void XMLTextFieldExport::ExportElement(enum
XMLTokenEnum eElementName,
// Element
if (eElementName == XML_SENDER_INITIALS)
{
-SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_LO_EXT,
- eElementName, bAddSpace, bAddSpace );
-// export content
-GetExport().Characters(sContent);
+if (SvtSaveOptions().GetODFDefaultVersion()
SvtSaveOptions::ODFVER_012)
+{
+SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_LO_EXT,
+eElementName, bAddSpace, bAddSpace );
+// export content
+GetExport().Characters(sContent);
+}
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - liborcus/liborcus-handle-invalid-xml.patch.1 liborcus/UnpackedTarball_liborcus.mk
liborcus/UnpackedTarball_liborcus.mk |3 +++ liborcus/liborcus-handle-invalid-xml.patch.1 | 12 2 files changed, 15 insertions(+) New commits: commit cc6ce861fe67be93cb14c6c142fabeeffd1fdcd9 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Dec 13 21:06:04 2013 +0100 handle invalid xml files in orcus, fdo#63844 Change-Id: I82fff6ab89acece0e46c92bfca2c7faf967639b8 Signed-off-by: Kohei Yoshida kohei.yosh...@collabora.com Reviewed-on: https://gerrit.libreoffice.org/7077 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/liborcus/UnpackedTarball_liborcus.mk b/liborcus/UnpackedTarball_liborcus.mk index e43144d..062999d 100644 --- a/liborcus/UnpackedTarball_liborcus.mk +++ b/liborcus/UnpackedTarball_liborcus.mk @@ -21,6 +21,9 @@ liborcus_patches += liborcus_0.1.0-configure.patch # don't use dllimport liborcus_patches += liborcus_0.1.0-dllimport.patch +# fdo#63844 +liborcus_patches += liborcus-handle-invalid-xml.patch.1 + ifeq ($(OS),MACOSX) # no tac command on OS X, but tail -r liborcus_patches += liborcus_0.1.0-tac.patch diff --git a/liborcus/liborcus-handle-invalid-xml.patch.1 b/liborcus/liborcus-handle-invalid-xml.patch.1 new file mode 100644 index 000..4cb091d --- /dev/null +++ b/liborcus/liborcus-handle-invalid-xml.patch.1 @@ -0,0 +1,12 @@ +diff -ur liborcus.org/include/orcus/sax_parser.hpp liborcus/include/orcus/sax_parser.hpp +--- liborcus.org/include/orcus/sax_parser.hpp 2013-12-13 20:51:55.126503773 +0100 liborcus/include/orcus/sax_parser.hpp 2013-12-13 20:57:39.076174743 +0100 +@@ -278,6 +278,8 @@ + special_tag(); + break; + default: ++if (!is_alpha(c)) ++throw malformed_xml_error(expect an alphabet.); + element_open(pos); + } + } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/acccell.cxx|4
sw/source/core/access/accembedded.cxx|2 ++
sw/source/core/access/accfield.cxx |1 +
sw/source/core/access/accgraphic.cxx |2 ++
sw/source/core/access/acchyperlink.cxx |4
sw/source/core/access/accnotextframe.cxx |2 ++
sw/source/core/access/accnotexthyperlink.cxx | 12
sw/source/core/access/accpara.cxx|8
sw/source/core/access/accselectionhelper.cxx |2 ++
sw/source/core/access/acctable.cxx |8
sw/source/core/access/acctextframe.cxx |4
11 files changed, 49 insertions(+)
New commits:
commit 8552bd76dcbb1db407bc9b0c1ab32a9f3afac87a
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 13 23:33:21 2013 +0100
sw: add some more obviously missing mutex guards
... to methods added in 76c549eb01dcb7b5bf28a271ce00e386f3d388ba
Change-Id: I32101ec882420babb394af6db5cd56d1035acf4a
diff --git a/sw/source/core/access/acccell.cxx
b/sw/source/core/access/acccell.cxx
index 8bc30eb..84c3347 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -424,6 +424,8 @@ static OUString ReplaceFourChar(OUString oldOUString)
::com::sun::star::uno::Any SAL_CALL SwAccessibleCell::getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException)
{
+SolarMutexGuard g;
+
::com::sun::star::uno::Any strRet;
SwFrmFmt *pFrmFmt = GetTblBoxFormat();
DBG_ASSERT(pFrmFmt,Must be Valid);
@@ -442,6 +444,8 @@ static OUString ReplaceFourChar(OUString oldOUString)
sal_Int32 SAL_CALL SwAccessibleCell::getBackground()
throw (::com::sun::star::uno::RuntimeException)
{
+SolarMutexGuard g;
+
const SvxBrushItem rBack = GetFrm()-GetAttrSet()-GetBackground();
sal_uInt32 crBack = rBack.GetColor().GetColor();
diff --git a/sw/source/core/access/accembedded.cxx
b/sw/source/core/access/accembedded.cxx
index 61680c5..0dab373 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -111,6 +111,8 @@ uno::Sequence sal_Int8 SAL_CALL
SwAccessibleEmbeddedObject::getImplementation
::com::sun::star::uno::Any SAL_CALL
SwAccessibleEmbeddedObject::getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException)
{
+SolarMutexGuard g;
+
::com::sun::star::uno::Any strRet;
OUString style;
SwFlyFrm* pFFrm = getFlyFrm();
diff --git a/sw/source/core/access/accfield.cxx
b/sw/source/core/access/accfield.cxx
index cb9532c..3ed4da8 100644
--- a/sw/source/core/access/accfield.cxx
+++ b/sw/source/core/access/accfield.cxx
@@ -88,6 +88,7 @@ sal_Int32 SAL_CALL
SwAccessibleField::getAccessibleIndexInParent (void)
sal_Int16 SAL_CALL SwAccessibleField::getAccessibleRole (void)
throw (::com::sun::star::uno::RuntimeException)
{
+SolarMutexGuard g;
return m_nRole;
}
diff --git a/sw/source/core/access/accgraphic.cxx
b/sw/source/core/access/accgraphic.cxx
index 5326df0..c921546 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -79,6 +79,8 @@ Sequence sal_Int8 SAL_CALL
SwAccessibleGraphic::getImplementationId()
sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole (void)
throw (::com::sun::star::uno::RuntimeException)
{
+SolarMutexGuard g;
+
SwFmtURL aURL( ((SwLayoutFrm*)GetFrm())-GetFmt()-GetURL() );
if (aURL.GetMap())
diff --git a/sw/source/core/access/acchyperlink.cxx
b/sw/source/core/access/acchyperlink.cxx
index 79045f2..0a1f67c 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -149,6 +149,8 @@ uno::Any SAL_CALL
SwAccessibleHyperlink::getAccessibleActionAnchor(
sal_Int32 nIndex)
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+SolarMutexGuard g;
+
uno::Any aRet;
if(nIndex != 0)
throw lang::IndexOutOfBoundsException();
@@ -162,6 +164,8 @@ uno::Any SAL_CALL
SwAccessibleHyperlink::getAccessibleActionObject(
sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
+SolarMutexGuard g;
+
if(nIndex != 0)
throw lang::IndexOutOfBoundsException();
const SwTxtAttr *pTxtAttr = GetTxtAttr();
diff --git a/sw/source/core/access/accnotextframe.cxx
b/sw/source/core/access/accnotextframe.cxx
index f9c6dac..378c521 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -355,6 +355,8 @@ sal_Int32 SAL_CALL
SwAccessibleNoTextFrame::getHyperLinkIndex( sal_Int32 )
AccessibleRelation SwAccessibleNoTextFrame::makeRelation( sal_Int16 nType,
const SwFlyFrm* pFrm )
{
+SolarMutexGuard g;
+
uno::Sequenceuno::ReferenceXInterface aSequence(1);
aSequence[0] =
cppcheck: Same expression in chartexport.cxx (oox module)
Hello, Cppcheck reported this: [oox/source/export/chartexport.cxx:1822] - [oox/source/export/chartexport.cxx:1822]: (style) Same expression on both sides of '=='. Indeed we have: 1822 if (aValues[i] == aValues[i]) 1823 pFS-write( aValues[i] ); see http://opengrok.libreoffice.org/xref/core/oox/source/export/chartexport.cxx#1790 (at this moment) I thought first about == overloading but didn't find it (or missed it) Any idea? Julien -- View this message in context: http://nabble.documentfoundation.org/cppcheck-Same-expression-in-chartexport-cxx-oox-module-tp4088146.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - connectivity/source sc/source
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx |2 +-
sc/source/ui/app/scmod.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d67684f62fc99dd25fb46ddb547e8ff4345d0970
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Dec 14 00:01:59 2013 +0100
cppcheck: fix same expression, no need to cast twice
Change-Id: I08a68071db45ee79491558dd88e723dcdf0d24d5
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index dfeeba9..f31cc57 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1123,7 +1123,7 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet )
if ( rOptSet.HasItem(SID_ATTR_GRID_OPTIONS,pItem) )
{
-ScGridOptions aNewGridOpt( (const SvxOptionsGrid)((const
SvxGridItem)*pItem) );
+ScGridOptions aNewGridOpt( (const SvxGridItem)*pItem) );
if ( pViewSh )
{
commit ffbde4e6a6ead7efdd65aa6bd31e9ea55f9c637e
Author: Julien Nabet serval2...@yahoo.fr
Date: Fri Dec 13 23:53:29 2013 +0100
cppcheck: fix same expression
!pSchemaPat-isEmpty() checked twice where line before we test if aPKQ is
empty
so it seemed quite logical to test aPKO here
Change-Id: I79d7ec89f7ae67520492bbd4121a4a86918f2fbf
diff --git
a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 2e772fc..f7af806 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -999,7 +999,7 @@ void ODatabaseMetaDataResultSet::openColumns( const Any
catalog,
aCOL = OUStringToOString(columnNamePattern,m_nTextEncoding);
const char *pPKQ = catalog.hasValue() !aPKQ.isEmpty() ? aPKQ.getStr()
: NULL,
-*pPKO = pSchemaPat !pSchemaPat-isEmpty()
!pSchemaPat-isEmpty() ? aPKO.getStr() : NULL,
+*pPKO = pSchemaPat !pSchemaPat-isEmpty()
!aPKO.isEmpty() ? aPKO.getStr() : NULL,
*pPKN = aPKN.getStr(),
*pCOL = aCOL.getStr();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/scmod.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 00e9f30360216581c1d9d105fa522da69e078ed8
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Dec 14 00:05:45 2013 +0100
Oups
Change-Id: I0e812a08fbd3bb1f16b8c5b2860343a5e5235f71
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index f31cc57..353a468 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1123,7 +1123,7 @@ void ScModule::ModifyOptions( const SfxItemSet rOptSet )
if ( rOptSet.HasItem(SID_ATTR_GRID_OPTIONS,pItem) )
{
-ScGridOptions aNewGridOpt( (const SvxGridItem)*pItem) );
+ScGridOptions aNewGridOpt( (const SvxGridItem)*pItem );
if ( pViewSh )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/core/drawdoc2.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c7f4b6bb955ef8841c41e3595d152b5931f5c7a7 Author: Julien Nabet serval2...@yahoo.fr Date: Sat Dec 14 00:08:06 2013 +0100 cppcheck: same expression, should check aPageOffset.X and aPageOffset.Y Change-Id: Ibec07fba0b2070a4dea7fd0008d7e5fd0af906d7 diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 6b29aa0..408ed37 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -536,7 +536,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ ) Size aOutSize(pPrinter-GetOutputSize()); Point aPageOffset(pPrinter-GetPageOffset()); aPageOffset -= pPrinter-PixelToLogic( Point() ); -long nOffset = !aPageOffset.X() !aPageOffset.X() ? 0 : PRINT_OFFSET; +long nOffset = !aPageOffset.X() !aPageOffset.Y() ? 0 : PRINT_OFFSET; sal_uLong nTop= aPageOffset.Y(); sal_uLong nLeft = aPageOffset.X(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/docvw/edtwin.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f279acd3678d014d9d5dafe41971e0da4dec7b6c
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Dec 14 00:15:28 2013 +0100
cppcheck: reduce scope
Change-Id: I93153e066f136d977c3d5ea12da174bd26975e27
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 4b82c16..723602b 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2775,8 +2775,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
{
SwWrtShell rSh = m_rView.GetWrtShell();
-SdrObject* pObj;
-SdrPageView* pPV;
// We have to check if a context menu is shown and we have an UI
// active inplace client. In that case we have to ignore the mouse
// button down event. Otherwise we would crash (context menu has been
@@ -3090,6 +3088,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
// only if no position to size was hit.
if (!bHitHandle)
{
+SdrObject* pObj;
+SdrPageView* pPV;
if (pSdrView-PickObj(aDocPos,
pSdrView-getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER |
SDRSEARCH_BEFOREMARK))
{
pSdrView-UnmarkAllObj();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
cppcheck: Same expression in edtwin.cxx (sw module)
Hello, Cppcheck reported this: [sw/source/ui/docvw/edtwin.cxx:3322] - [sw/source/ui/docvw/edtwin.cxx:3322]: (style) Same expression on both sides of '' Indeed we have: 3319 // if the cursor position was corrected or if a Fly 3320 // was selected in ReadOnlyMode, no word selection. 3321 if ( !bValidCrsrPos || 3322 (rSh.IsFrmSelected() rSh.IsFrmSelected() )) 3323 return; git history indicates it's like this since initial import in (2000-03-18) Of course I could remove one rSh.IsFrmSelected() but not sure at all when reading comment above. Any idea? Julien -- View this message in context: http://nabble.documentfoundation.org/cppcheck-Same-expression-in-edtwin-cxx-sw-module-tp4088148.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - xmloff/source
xmloff/source/text/txtflde.cxx | 38 +++---
1 file changed, 27 insertions(+), 11 deletions(-)
New commits:
commit 4031765b004dded31f04c54f9a055b7a3d0053f2
Author: Eike Rathke er...@redhat.com
Date: Fri Dec 13 23:30:34 2013 +0100
fdo#72697 actually write this only in ODF 1.2 extended
(cherry picked from commit 49f9694e34d07468cff4a7e4de332f11be3e0dd8)
Conflicts:
xmloff/source/text/txtflde.cxx
Change-Id: I32097cc4b8a67615b0b6d6172cafd0edad7469b6
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index cc9ca75..f4ce99c 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -1752,14 +1752,17 @@ void XMLTextFieldExport::ExportFieldHelper(
GetExport().Characters(aBuffer.makeStringAndClear());
}
-// initials
-OUString aInitials( GetStringProperty(sPropertyInitials, rPropSet) );
-if( !aInitials.isEmpty() )
+if (SvtSaveOptions().GetODFDefaultVersion()
SvtSaveOptions::ODFVER_012)
{
-SvXMLElementExport aCreatorElem( GetExport(), XML_NAMESPACE_TEXT,
- XML_SENDER_INITIALS, sal_True,
- sal_False );
-GetExport().Characters(aInitials);
+// initials
+OUString aInitials( GetStringProperty(sPropertyInitials, rPropSet)
);
+if( !aInitials.isEmpty() )
+{
+SvXMLElementExport aCreatorElem( GetExport(),
XML_NAMESPACE_TEXT,
+XML_SENDER_INITIALS, sal_True,
+sal_False );
+GetExport().Characters(aInitials);
+}
}
com::sun::star::uno::Reference com::sun::star::text::XText xText;
@@ -2226,10 +2229,23 @@ void XMLTextFieldExport::ExportElement(enum
XMLTokenEnum eElementName,
if (eElementName != XML_TOKEN_INVALID)
{
// Element
-SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
- eElementName, bAddSpace, bAddSpace );
-// export content
-GetExport().Characters(sContent);
+if (eElementName == XML_SENDER_INITIALS)
+{
+if (SvtSaveOptions().GetODFDefaultVersion()
SvtSaveOptions::ODFVER_012)
+{
+SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
+eElementName, bAddSpace, bAddSpace );
+// export content
+GetExport().Characters(sContent);
+}
+}
+else
+{
+SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
+ eElementName, bAddSpace, bAddSpace );
+// export content
+GetExport().Characters(sContent);
+}
} else {
// always export content
GetExport().Characters(sContent);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/experimental ios/MobileLibreOffice sw/source vcl/headless vcl/inc vcl/ios vcl/Library_vcl.mk vcl/osx vcl/quartz
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj |2
ios/experimental/LibreOffice/LibreOffice.xcodeproj/project.pbxproj |6
sw/source/core/view/viewsh.cxx | 27
vcl/Library_vcl.mk |4
vcl/headless/svpgdi.cxx|8
vcl/headless/svpinst.cxx | 28
vcl/inc/headless/svpframe.hxx |1
vcl/inc/headless/svpgdi.hxx| 75 ++
vcl/inc/headless/svpinst.hxx |4
vcl/inc/osx/saldata.hxx|6
vcl/inc/osx/salinst.h |3
vcl/inc/osx/salvd.h| 85 --
vcl/inc/quartz/salbmp.h|2
vcl/inc/quartz/salvd.h | 69 ++
vcl/inc/saldatabasic.hxx |3
vcl/ios/iosinst.cxx|4
vcl/osx/salinst.cxx|2
vcl/osx/salvd.cxx | 261
-
vcl/quartz/salbmp.cxx |6
vcl/quartz/salgdi.cxx | 33 -
vcl/quartz/salgdicommon.cxx| 92 ++-
vcl/quartz/salvd.cxx | 284
++
22 files changed, 562 insertions(+), 443 deletions(-)
New commits:
commit 6265876ae9f1bb862440182d2d2c9b9b5b322668
Author: Tor Lillqvist t...@collabora.com
Date: Mon Dec 9 21:53:23 2013 +0200
iOS tiled rendering work
Possibly quite broken intermediate commit. But anyway, now it is
possible to render the tile diretly to a CGContext. Can be seen in
the MobileLibreOffice app when build in the Debug_tile_tester
configuration. See touch_lo_draw_tile() in viewsh.cxx. Unfortunately
the old plain LibreOffice test app is now broken, though, and
displays nothing at all.
This refactoring and hacking in vcl was done in a quite ugly fashion,
with ifdefs etc. But trust me, I did try, several times, for many
days, to get where I wanted in an elegant and clean fashion. But doing
it cleanly meant not being able to actually build it for days while
trying to figure ut which bits go where and which class should be
split into what base and derived class(es), and it was too much for my
limited brain capacity. I just couldn't juggle all the vcl class
structure in my head, especially as I don't have any good
understanding of the general design of it all.
Change-Id: Ia59d6a9cce15a63e63f94e8d8574bef21993fb1f
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 858beb7..ce34006 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -268,6 +268,7 @@
BE82BE4D1822D10F00A447B5 /* ctlayout.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ctlayout.cxx;
path = ../../vcl/quartz/ctlayout.cxx; sourceTree = group; };
BE82BE4E1822D10F00A447B5 /* salgdi.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salgdi.cxx;
path = ../../vcl/quartz/salgdi.cxx; sourceTree = group; };
BEC9DABC1858BA39009CCCB3 /* svdpagv.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svdpagv.cxx;
path = ../../svx/source/svdraw/svdpagv.cxx; sourceTree = group; };
+ BEDB0EFB185A05BE009A6F26 /* salvd.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salvd.cxx;
path = ../../vcl/quartz/salvd.cxx; sourceTree = group; };
BEE68B5D185715EE0049ECE0 /* salbmp.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = salbmp.cxx;
path = ../../vcl/quartz/salbmp.cxx; sourceTree = group; };
BEE68B5E185715EE0049ECE0 /* salgdicommon.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
salgdicommon.cxx; path = ../../vcl/quartz/salgdicommon.cxx; sourceTree =
group; };
BEE68B5F185715EE0049ECE0 /* salgdiutils.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
salgdiutils.cxx; path = ../../vcl/quartz/salgdiutils.cxx; sourceTree =
group; };
@@ -700,6 +701,7 @@
BEE68B5E185715EE0049ECE0 /* salgdicommon.cxx */,
BEE68B5F185715EE0049ECE0 /* salgdiutils.cxx
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/saldata.cxx |4
1 file changed, 4 deletions(-)
New commits:
commit f4c3754a0c36181652625494eb6d463ae7a04f4d
Author: Tor Lillqvist t...@collabora.com
Date: Sat Dec 14 01:51:51 2013 +0200
Fix fallout from 6265876ae9f1bb862440182d2d2c9b9b5b322668
Change-Id: I62023c594d2cb2d4bf76459a9c1caaa5060c4b49
diff --git a/vcl/osx/saldata.cxx b/vcl/osx/saldata.cxx
index 55a5e64..2bf2d8c 100644
--- a/vcl/osx/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -44,8 +44,6 @@ SalData::SalData()
mpStatusItem( nil ),
mxRGBSpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB) ),
mxGraySpace( CGColorSpaceCreateWithName(kCGColorSpaceGenericGray) ),
-mxP50Space( NULL ),
-mxP50Pattern( NULL ),
maCursors( POINTER_COUNT, INVALID_CURSOR_PTR ),
mbIsScrollbarDoubleMax( false ),
#if !HAVE_FEATURE_MACOSX_SANDBOX
@@ -61,8 +59,6 @@ SalData::SalData()
SalData::~SalData()
{
-CGPatternRelease( mxP50Pattern );
-CGColorSpaceRelease( mxP50Space );
CGColorSpaceRelease( mxRGBSpace );
CGColorSpaceRelease( mxGraySpace );
for( unsigned int i = 0; i maCursors.size(); i++ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
