[Libreoffice-commits] core.git: include/rtl sal/osl
include/rtl/alloc.h | 13 +++--
sal/osl/unx/memory.c | 13 ++---
2 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit 9dfa48405fff9fe03519804c962d0f73951deb64
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Feb 28 09:30:06 2014 +0100
Missing @since tags, and adapt to semantics of posix_memalign
Change-Id: I677d973fbcf118111b5fc93b09143c66b0afb0d9
diff --git a/include/rtl/alloc.h b/include/rtl/alloc.h
index 01a556b..6a80492 100644
--- a/include/rtl/alloc.h
+++ b/include/rtl/alloc.h
@@ -96,14 +96,20 @@ SAL_DLLPUBLIC void SAL_CALL rtl_freeZeroMemory (
) SAL_THROW_EXTERN_C();
-/** Allocate memory.
+/** Allocate aligned memory.
A call to this function will return NULL upon the requested
memory size being either zero or larger than currently allocatable.
-@param Alignment alignment in bytes.
+Memory obtained through this function must be freed with
+rtl_freeAlignedMemory.
+
+@param Alignment [in] alignment in bytes, must be a power of two multiple
of
+sizeof(void*).
@param Bytes [in] memory size.
@return pointer to allocated memory.
+
+@since LibreOffice 4.3
*/
SAL_DLLPUBLIC void* SAL_CALL rtl_allocateAlignedMemory (
sal_Size Alignment,
@@ -112,8 +118,11 @@ SAL_DLLPUBLIC void* SAL_CALL rtl_allocateAlignedMemory (
/** Free memory allocated with rtl_allocateAlignedMemory.
+
@param Ptr [in] pointer to previously allocated memory.
@return none. Memory is released. Ptr is invalid.
+
+@since LibreOffice 4.3
*/
SAL_DLLPUBLIC void SAL_CALL rtl_freeAlignedMemory (
void * Ptr
diff --git a/sal/osl/unx/memory.c b/sal/osl/unx/memory.c
index 2b6c20f..ca241b1 100644
--- a/sal/osl/unx/memory.c
+++ b/sal/osl/unx/memory.c
@@ -19,9 +19,16 @@ void* osl_aligned_alloc( sal_Size align, sal_Size size )
#ifdef __ANDROID__
return memalign(align, size);
#else
-void* ptr;
-int err = posix_memalign(ptr, align, size);
-return err ? NULL : ptr;
+if (size == 0)
+{
+return NULL;
+}
+else
+{
+void* ptr;
+int err = posix_memalign(ptr, align, size);
+return err ? NULL : ptr;
+}
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: GSoC 2014 Fresh Ideas
Hello, Great to see you interested in hacking with us this summer! On Thu, 2014-02-27 at 03:22 +0530, Ashutosh Agarwal wrote: I wish to contribute to LibreOffice and work through GSoC 2014. I have read through the Ideas page of LibreOffice. I have a few project ideas other than those listed there. You mostly need to find hackers wanting to mentor on these topics. 1) Writer - Bullets and Numbering button I wish to implement a bullets and numbering button in the toolbar, since it is a frequently used command. The toolbar button could be a button-cum-dropdown populated with frequently used bullet and numbering styles and an advanced button as a shortcut to the complete dialog box. This one task looks too simple for the whole summer. You may even try to work on it as an easy hack, with some help from people knowing the toolbars code. 2) Writer - Advanced Text Shadows I wish to implement advanced text shadows as a part of formatting characters. The new text shadow would be more customizable. The user will be able to control relative x, y positioning, blur radius, colour of the shadow. We could render a toolbar button for the same if possible. Looks interesting, but not that easy. It may also require you to work on an ODF change proposition. Please review the ideas and make suggestions as necessary. I hope you are aware of the fact that all application submissions need to come with a solved easy hack or fixed bug in order to be complete. That means you need to build and hack LibreOffice before submitting the application. Kind regards, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: STL iterators and for loops
On 02/28/2014 06:42 AM, Tor Lillqvist wrote: My builds with --enable-dbgutil are noticeably slow, OTOH, hoisting vec.end() so that is is called only once should be a quite mechanical task, Mechanical tasks are typically those where it is very easy to miss some crucial detail in some case and introduce a bug. ...like cases that purposefully keep re-evaluating end() because it gets invalidated in the loop's body. Also, hoisting the variable typically doesn't make the code more readable, and all this will eventually become moot with C++11 anyway. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/sidebar/tools/ColorControl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cd56e54df1df9c9e1a455f81bd86457f1d832604 Author: Jan Holesovsky ke...@collabora.com Date: Fri Feb 28 10:09:48 2014 +0100 I guess const was intended here. Change-Id: Iba157cca516add9403e8eace64430ed7008f4f2c diff --git a/svx/source/sidebar/tools/ColorControl.cxx b/svx/source/sidebar/tools/ColorControl.cxx index 0ca0f3c..684c5c2 100644 --- a/svx/source/sidebar/tools/ColorControl.cxx +++ b/svx/source/sidebar/tools/ColorControl.cxx @@ -136,7 +136,7 @@ void ColorControl::FillColors (void) const Size aNewSize(maVSColor.layoutAllVisible(nColorCount)); maVSColor.SetOutputSizePixel(aNewSize); -static sal_Int32 nAdd = 4; +const sal_Int32 nAdd = 4; SetOutputSizePixel(Size(aNewSize.Width() + nAdd, aNewSize.Height() + nAdd)); Link aLink = LINK(this, ColorControl, VSSelectHdl); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/dbggui.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5ce23eb9f12a52efcd7eb84d0b8ddc380d12eecb
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 11:27:59 2014 +0200
WaE: implicit conversion (IntegralCast) from bool to 'long'
Presumably RET_OK is what is meant here (that is how the code has worked,
anyway, as RET_OK == 1 == sal_True).
Change-Id: Ib6afffc606c6bc36b5ef4cf04991207c8c109973
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 1eab532..d13dc81 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -973,7 +973,7 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton )
) );
aBox.Execute();
}
-EndDialog( true );
+EndDialog( RET_OK );
}
else if ( pButton == maInfoButton )
{
___
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 vcl/source
include/vcl/vclmedit.hxx |2 +-
vcl/source/control/button.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit cd3211dcf110a5a8a906c16c8f1b25b8fed94b40
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 11:33:52 2014 +0200
WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'
Change-Id: I0b325abc275b672a96c5513d285c0f5764dfb4fe
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 7e21355..c95258a 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -75,7 +75,7 @@ public:
virtual voidEnableUpdateData( sal_uLong nTimeout =
EDIT_UPDATEDATA_TIMEOUT );
virtual voidDisableUpdateData() { delete pUpdateDataTimer;
pUpdateDataTimer = NULL; }
-virtual voidSetReadOnly( bool bReadOnly = sal_True );
+virtual voidSetReadOnly( bool bReadOnly = true );
virtual boolIsReadOnly() const;
voidEnableFocusSelectionHide( bool bHide );
commit b530a91f059ac29b1f596f36f3eb065de4db4352
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 11:32:04 2014 +0200
WaE: implicit conversion (IntegralCast) from bool to 'long'
Use the proper RET_OK amd RET_CANCEL parameters to EndDialog().
Change-Id: I2500e5e9793ee98c8cf38fc094d9f984576b67db
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 5c8859a..3086de5 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1682,7 +1682,7 @@ void OKButton::Click()
if ( pParent-IsDialog() )
{
if ( ((Dialog*)pParent)-IsInExecute() )
-((Dialog*)pParent)-EndDialog( true );
+((Dialog*)pParent)-EndDialog( RET_OK );
// prevent recursive calls
else if ( !((Dialog*)pParent)-IsInClose() )
{
@@ -1739,7 +1739,7 @@ void CancelButton::Click()
if ( pParent-IsDialog() )
{
if ( ((Dialog*)pParent)-IsInExecute() )
-((Dialog*)pParent)-EndDialog( false );
+((Dialog*)pParent)-EndDialog( RET_CANCEL );
// prevent recursive calls
else if ( !((Dialog*)pParent)-IsInClose() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/field2.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8353589e7a5626d840d05d3baa0ba79852f522f0
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 11:35:36 2014 +0200
WaE: implicit conversion (IntegralCast) from bool to 'int'
These two functions should surely be of type bool.
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index af2845c..b0ae9bb 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -144,7 +144,7 @@ static void ImplSkipDelimiters( const sal_Unicode* rpBuf )
}
}
-static int ImplIsPatternChar( sal_Unicode cChar, sal_Char cEditMask )
+static bool ImplIsPatternChar( sal_Unicode cChar, sal_Char cEditMask )
{
sal_Int32 nType = 0;
@@ -209,7 +209,7 @@ static sal_Unicode ImplPatternChar( sal_Unicode cChar,
sal_Char cEditMask )
return 0;
}
-static int ImplCommaPointCharEqual( sal_Unicode c1, sal_Unicode c2 )
+static bool ImplCommaPointCharEqual( sal_Unicode c1, sal_Unicode c2 )
{
if ( c1 == c2 )
return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/jpeg/JpegReader.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f3f9e2d4fe7fdff8dff6d4dab62f96b87f5141a4 Author: Tor Lillqvist t...@collabora.com Date: Fri Feb 28 11:41:06 2014 +0200 WaE: implicit conversion from bool to 'boolean' (aka 'int') 'boolean' is from the JPEG library, typedeffed as int, yay. Change-Id: I6d35c3616e50127f1e00b47c25cf962fdc92c3db diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx index 1069773..2d31249 100644 --- a/vcl/source/filter/jpeg/JpegReader.cxx +++ b/vcl/source/filter/jpeg/JpegReader.cxx @@ -60,7 +60,7 @@ extern C void init_source (j_decompress_ptr cinfo) * but we don't clear the input buffer. * This is correct behavior for reading a series of images from one source. */ -source-start_of_file = true; +source-start_of_file = 1; } long StreamRead( SvStream* pStream, void* pBuffer, long nBufferSize ) @@ -108,7 +108,7 @@ extern C boolean fill_input_buffer (j_decompress_ptr cinfo) source-pub.next_input_byte = source-buffer; source-pub.bytes_in_buffer = nbytes; -source-start_of_file = false; +source-start_of_file = 0; return true; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/column.cxx |1 - dbaccess/source/ui/querydesign/JoinController.cxx|1 - dbaccess/source/ui/querydesign/querycontroller.cxx |1 - dbaccess/source/ui/relationdesign/RelationController.cxx |1 - 4 files changed, 4 deletions(-) New commits: commit 9661d5b1645782be27cface246d0250728452f74 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Feb 28 10:43:29 2014 +0100 Remove unused #include comphelper/basicio.hxx Change-Id: I710d430342de0f1bfb98227264df3a44283f8dc2 diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index 8b11abe..737f5a0 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -29,7 +29,6 @@ #include com/sun/star/sdbc/ColumnValue.hpp #include com/sun/star/sdbc/DataType.hpp -#include comphelper/basicio.hxx #include comphelper/enumhelper.hxx #include comphelper/extract.hxx #include comphelper/property.hxx diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index ad5ef6b..d2af9ca 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -40,7 +40,6 @@ #include connectivity/dbexception.hxx #include com/sun/star/ui/dialogs/XExecutableDialog.hpp #include comphelper/streamsection.hxx -#include comphelper/basicio.hxx #include comphelper/seqstream.hxx #include com/sun/star/io/XActiveDataSource.hpp #include com/sun/star/io/XActiveDataSink.hpp diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 43c89f0..f1e73aa 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -65,7 +65,6 @@ #include com/sun/star/frame/XUntitledNumbers.hpp #include com/sun/star/ui/XUIElement.hpp -#include comphelper/basicio.hxx #include comphelper/processfactory.hxx #include comphelper/property.hxx #include comphelper/seqstream.hxx diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index d188bad..43c0f04 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -50,7 +50,6 @@ #include connectivity/dbmetadata.hxx #include com/sun/star/ui/dialogs/XExecutableDialog.hpp #include comphelper/streamsection.hxx -#include comphelper/basicio.hxx #include comphelper/seqstream.hxx #include com/sun/star/io/XActiveDataSource.hpp #include com/sun/star/io/XActiveDataSink.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/store/stdexception.cxx | 199 +++
1 file changed, 199 insertions(+)
New commits:
commit d44a3aa9762c070881a1449277e98fb5dfc64b1b
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Feb 28 10:44:53 2014 +0100
Save the stdexception rewriter plugin used in...
...5e21a413c788f839a66d9e4c14e745ed18058db8 retrofit std::exception into
overriding exception specs.
Change-Id: If802bbd26b91438f3f46fe18bc763d27967bac5c
diff --git a/compilerplugins/clang/store/stdexception.cxx
b/compilerplugins/clang/store/stdexception.cxx
new file mode 100644
index 000..3f93b27
--- /dev/null
+++ b/compilerplugins/clang/store/stdexception.cxx
@@ -0,0 +1,199 @@
+/* -*- 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/.
+ */
+
+#include algorithm
+#include cassert
+#include limits
+#include string
+
+#include plugin.hxx
+
+namespace {
+
+bool isStdException(QualType type) {
+//TODO:
+std::string name { type.getAsString() };
+return name == std::exception || name == ::std::exception;
+}
+
+class StdException:
+public RecursiveASTVisitorStdException, public loplugin::RewritePlugin
+{
+public:
+explicit StdException(InstantiationData const data): RewritePlugin(data)
+{}
+
+virtual void run() override
+{ TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
+
+bool VisitCXXMethodDecl(CXXMethodDecl const * decl);
+
+private:
+bool isInMainFile(SourceLocation spellingLocation) const;
+};
+
+bool StdException::VisitCXXMethodDecl(CXXMethodDecl const * decl) {
+if (ignoreLocation(decl)
+|| decl-begin_overridden_methods() == decl-end_overridden_methods())
+{
+return true;
+}
+CXXMethodDecl const * over = nullptr;
+for (auto i = decl-begin_overridden_methods();
+ i != decl-end_overridden_methods(); ++i)
+{
+FunctionProtoType const * t
+= (*i)-getType()-getAsFunctionProtoType();
+switch (t-getExceptionSpecType()) {
+case EST_None:
+continue;
+case EST_DynamicNone:
+case EST_BasicNoexcept:
+return true;
+case EST_Dynamic:
+{
+unsigned n = t-getNumExceptions();
+for (unsigned j = 0; j != n; ++j) {
+if (isStdException(t-getExceptionType(j))) {
+over = *i;
+goto found;
+}
+}
+return true;
+}
+case EST_ComputedNoexcept:
+switch (t-getNoexceptSpec(compiler.getASTContext())) {
+case FunctionProtoType::NR_NoNoexcept:
+case FunctionProtoType::NR_BadNoexcept:
+assert(false);
+// fall through
+case FunctionProtoType::NR_Dependent:
+break;
+case FunctionProtoType::NR_Throw:
+continue;
+case FunctionProtoType::NR_Nothrow:
+return true;
+}
+case EST_MSAny:
+case EST_Unevaluated:
+case EST_Uninstantiated:
+continue; //TODO???
+}
+}
+return true;
+found:
+FunctionProtoType const * t = decl-getType()-getAsFunctionProtoType();
+if (!t-hasDynamicExceptionSpec()) {
+report(
+DiagnosticsEngine::Warning,
+override does not have dynamic exception specification,
+decl-getLocStart())
+ decl-getSourceRange();
+report(
+DiagnosticsEngine::Note,
+(overridden declaration with dynamic exception specification
+ including std::exception is here),
+over-getLocStart());
+return true;
+}
+unsigned n = t-getNumExceptions();
+for (unsigned i = 0; i != n; ++i) {
+if (isStdException(t-getExceptionType(i))) {
+return true;
+}
+}
+SourceRange r { decl-getSourceRange() };
+SourceLocation l {
+compiler.getSourceManager().getExpansionLoc(r.getBegin()) };
+SourceLocation end {
+compiler.getSourceManager().getExpansionLoc(r.getEnd()) };
+assert(
+l == end
+|| compiler.getSourceManager().isBeforeInTranslationUnit(l, end));
+bool seenThrow = false;
+unsigned parens = 0;
+SourceLocation openParen;
+SourceLocation loc;
+for (;;) {
+unsigned n = Lexer::MeasureTokenLength(
+l, compiler.getSourceManager(), compiler.getLangOpts());
+std::string s { compiler.getSourceManager().getCharacterData(l), n };
+if (s == { || s == ;) {
+break;
+}
+if (!seenThrow) {
+
[Libreoffice-commits] core.git: 3 commits - vcl/source
vcl/source/gdi/print.cxx|4 ++--
vcl/source/helper/strhelper.cxx |4 ++--
vcl/source/window/dialog.cxx|4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 02e355370dcac945172c0064258ce66a98d193fd
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 11:49:58 2014 +0200
More EndDialog() cleanup
Change-Id: I2e79190936d1eb7f55b521d2ce558fba45bf5f28
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 0d648a6..55f9856 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -790,7 +790,7 @@ bool Dialog::Close()
if ( IsInExecute() )
{
-EndDialog( false );
+EndDialog( RET_CANCEL );
mbInClose = false;
return true;
}
@@ -1078,7 +1078,7 @@ void Dialog::EndAllDialogs( Window* pParent )
pTempModDialog = pModDialog-mpPrevExecuteDlg;
if( !pParent || ( pParent pParent-IsWindowOrChild( pModDialog, true )
) )
{
-pModDialog-EndDialog( false );
+pModDialog-EndDialog( RET_CANCEL );
pModDialog-PostUserEvent( Link() );
}
pModDialog = pTempModDialog;
commit df94df2d7beba113f915c92f5ccb3af706ac08d6
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 11:48:01 2014 +0200
WaE: implicit conversion (IntegralCast) from bool to 'int'
The bIncludeUntil parameter is used as a bool, so make it a bool. It is
passed
bool values anyway.
Change-Id: If477419e8d94af69ad2bd5b452819e83a5a8149f
diff --git a/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx
index 4376ab1..53fd5b0 100644
--- a/vcl/source/helper/strhelper.cxx
+++ b/vcl/source/helper/strhelper.cxx
@@ -49,7 +49,7 @@ inline bool isProtect( sal_Unicode cChar )
return cChar == '`' || cChar == '\'' || cChar == '';
}
-inline void CopyUntil( char* pTo, const char* pFrom, char cUntil, int
bIncludeUntil = 0 )
+inline void CopyUntil( char* pTo, const char* pFrom, char cUntil, bool
bIncludeUntil = false )
{
do
{
@@ -80,7 +80,7 @@ inline void CopyUntil( char* pTo, const char* pFrom, char
cUntil, int bInclude
pFrom++;
}
-inline void CopyUntil( sal_Unicode* pTo, const sal_Unicode* pFrom,
sal_Unicode cUntil, int bIncludeUntil = 0 )
+inline void CopyUntil( sal_Unicode* pTo, const sal_Unicode* pFrom,
sal_Unicode cUntil, bool bIncludeUntil = false )
{
do
{
commit 17ec83705ae7f005e4f729fe531c7f1e86415632
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 11:46:31 2014 +0200
WaE: implicit conversion (IntegralCast) from bool to 'sal_uLong'
Change-Id: I5089279745c4247ec0006f2273f6ec3d40d7c2a2
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 968ebab..d6eb52d 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -698,12 +698,12 @@ Printer::~Printer()
sal_uLong Printer::GetCapabilities( sal_uInt16 nType ) const
{
if ( IsDisplayPrinter() )
-return false;
+return 0;
if( mpInfoPrinter )
return mpInfoPrinter-GetCapabilities( maJobSetup.ImplGetConstData(),
nType );
else
-return false;
+return 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/source
vcl/source/window/printdlg.cxx |2 +-
vcl/source/window/toolbox2.cxx |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c005d07dbcea821ff620826090ca146d39788528
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 11:55:28 2014 +0200
WaE: implicit conversion (IntegralCast) from bool to 'sal_uInt16'
Change-Id: If6c41795a4015eb6bdd6bf785dd5ea6f7069e76b
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index b8db778..6008cfe 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1489,7 +1489,7 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, bool
bDown, bool bRelease )
if ( nPos != mnCurPos )
{
mnCurPos = nPos;
-ImplDrawItem( mnCurPos, true );
+ImplDrawItem( mnCurPos, 1 );
Flush();
}
}
@@ -1497,7 +1497,7 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, bool
bDown, bool bRelease )
{
if ( nPos == mnCurPos )
{
-ImplDrawItem( mnCurPos, false );
+ImplDrawItem( mnCurPos, 0 );
Flush();
mnCurPos = TOOLBOX_ITEM_NOTFOUND;
}
@@ -1799,7 +1799,7 @@ void ToolBox::ImplFillLayoutData() const
// only draw, if the rectangle is within PaintRectangle
if ( !pItem-maRect.IsEmpty() )
-const_castToolBox*(this)-ImplDrawItem( i, false, false, true );
+const_castToolBox*(this)-ImplDrawItem( i, 0, false, true );
}
}
commit bf470dcdf53beeca6a93f89b4d7c82ad11dc7168
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 11:52:04 2014 +0200
WaE: implicit conversion (IntegralCast) from bool to 'int'
Change-Id: I75d079a34355454a6e6b741f029c5ec37c149b17
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 7c1c5a2..7f7cbd8 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1052,7 +1052,7 @@ void PrintDialog::setupOptionalUI()
pBtn-SetText( aChoices[m] );
pBtn-Check( m == nSelectVal );
pBtn-SetToggleHdl( LINK( this, PrintDialog, UIOption_RadioHdl
) );
-if( aChoicesDisabled.getLength() m aChoicesDisabled[m] ==
true )
+if( aChoicesDisabled.getLength() m aChoicesDisabled[m] )
pBtn-Enable( false );
pBtn-Show();
maPropertyToWindowMap[ aPropertyName ].push_back( pBtn );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/source
vcl/source/window/toolbox.cxx |2 +-
vcl/source/window/window.cxx |8
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 29a4487a067946fa3227807787280d1f13c45d1a
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 12:10:46 2014 +0200
WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'
Change-Id: I70eb7c04d12fad8f46f549bf5d43e1d1ffb724a1
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 0c51710..277531b 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -6266,7 +6266,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
else if ( mpWindowImpl-mbFrame )
{
mpWindowImpl-mbSuppressAccessibilityEvents = true;
-mpWindowImpl-mpFrame-Show( sal_False, sal_False );
+mpWindowImpl-mpFrame-Show( false, false );
}
StateChanged( STATE_CHANGE_VISIBLE );
@@ -6419,7 +6419,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
mpWindowImpl-mbPaintFrame = true;
bool bNoActivate = (nFlags (SHOW_NOACTIVATE|SHOW_NOFOCUSCHANGE))
? sal_True : sal_False;
-mpWindowImpl-mpFrame-Show( sal_True, bNoActivate );
+mpWindowImpl-mpFrame-Show( true, bNoActivate );
if( aDogTag.IsDead() )
return;
@@ -7603,7 +7603,7 @@ void Window::CaptureMouse()
if ( pSVData-maWinData.mpCaptureWin != this )
{
pSVData-maWinData.mpCaptureWin = this;
-mpWindowImpl-mpFrame-CaptureMouse( sal_True );
+mpWindowImpl-mpFrame-CaptureMouse( true );
}
}
@@ -7620,7 +7620,7 @@ void Window::ReleaseMouse()
if ( pSVData-maWinData.mpCaptureWin == this )
{
pSVData-maWinData.mpCaptureWin = NULL;
-mpWindowImpl-mpFrame-CaptureMouse( sal_False );
+mpWindowImpl-mpFrame-CaptureMouse( false );
ImplGenerateMouseMove();
}
}
commit 74c17d618759759e2ba532e09d36f4e34bca957d
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 12:09:00 2014 +0200
WaE: implicit conversion (IntegralCast) from bool to 'long'
Change-Id: I065858bdacf88f87eabe6cec516f6357acc11152
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index b43dd84..f749509 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1412,7 +1412,7 @@ IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel
)
else
EndDragging( true );
-return true;
+return (long) true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/inc vcl/unx
vcl/inc/headless/svpframe.hxx |2 +- vcl/unx/generic/app/saldisp.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 8f5444e83261dd7300326b6fc083572c21a86569 Author: Tor Lillqvist t...@collabora.com Date: Fri Feb 28 12:14:12 2014 +0200 WaE: implicit conversion (IntegralCast) from bool to 'int' Change-Id: Ifaeeb0f01dbcd0225ee50c15d0b2417f99b1bd0e diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index ea6f9b8..c343552 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -362,7 +362,7 @@ static int DisplayYield( int fd, SalX11Display *pDisplay ) GetSalData()-m_pInstance-GetYieldMutex()-acquire(); pDisplay-Yield(); GetSalData()-m_pInstance-GetYieldMutex()-release(); - return true; + return 1; } SalX11Display::SalX11Display( Display *display ) commit 9bbc04988a1a890b8db99d61497f567cbc7e21e0 Author: Tor Lillqvist t...@collabora.com Date: Fri Feb 28 12:12:28 2014 +0200 WaE: implicit conversion of literal of type 'sal_Bool' to 'bool' Change-Id: I826f7649a1e9ed8aad06848aa1f2ed5a5827f3ab diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 63986cf..8e72709 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -87,7 +87,7 @@ public: virtual voidDrawMenuBar(); virtual voidSetExtendedFrameStyle( SalExtStyle nExtStyle ); -virtual voidShow( bool bVisible, bool bNoActivate = sal_False ); +virtual voidShow( bool bVisible, bool bNoActivate = false ); virtual voidEnable( bool bEnable ); virtual voidSetMinClientSize( long nWidth, long nHeight ); virtual voidSetMaxClientSize( long nWidth, long nHeight ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/window/salframe.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0526048e4e7ae46b3a8cf6cd9a4d2ffe0a082167
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 12:16:17 2014 +0200
WaE: implicit conversion (IntegralCast) from bool to 'long'
Change-Id: If0d7ca02e8ecbc15eabc7807a71554ce11d92552
diff --git a/vcl/unx/generic/window/salframe.cxx
b/vcl/unx/generic/window/salframe.cxx
index 0d8ad33..c24e960 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -4015,7 +4015,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
}
bMapped_ = true;
bViewable_ = true;
-nRet = true;
+nRet = 1;
if ( mpInputContext != NULL )
mpInputContext-Map( this );
CallCallback( SALEVENT_RESIZE, NULL );
@@ -4075,7 +4075,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
{
bMapped_ = false;
bViewable_ = false;
-nRet = true;
+nRet = 1;
if ( mpInputContext != NULL )
mpInputContext-Unmap( this );
CallCallback( SALEVENT_RESIZE, NULL );
@@ -4090,7 +4090,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent )
case VisibilityNotify:
nVisibility_ = pEvent-xvisibility.state;
-nRet = true;
+nRet = 1;
if( bAlwaysOnTop_
bMapped_
! GetDisplay()-getWMAdaptor()-isAlwaysOnTopOK()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/dialogs/addresstemplate.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 51e937c27069711fe266963aa2a0dbfa8d99cf6b Author: Stephan Bergmann sberg...@redhat.com Date: Fri Feb 28 11:17:29 2014 +0100 loplugin:literaltoboolconversion Change-Id: If5949c6123e2816d0e7d9fd93d3e24dfecba1a56 diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 7104f68..ae09869 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -701,11 +701,11 @@ void AssignmentPersistentData::Commit() StyleSettings aSystemStyle = GetSettings().GetStyleSettings(); const ::Color rNewColor = aSystemStyle.GetDialogColor(); -m_pDatasource-SetReadOnly( sal_True ); +m_pDatasource-SetReadOnly( true ); m_pDatasource-SetBackground( Wallpaper( rNewColor ) ); m_pDatasource-SetControlBackground( rNewColor ); -m_pTable-SetReadOnly( sal_True ); +m_pTable-SetReadOnly( true ); m_pTable-SetBackground( Wallpaper( rNewColor ) ); m_pTable-SetControlBackground( rNewColor ); ___ 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/dialog/dinfdlg.cxx | 10 +-
sfx2/source/dialog/dockwin.cxx |2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a1fb07db18605364412c675e2b703855f6131b44
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Feb 28 11:23:28 2014 +0100
loplugin:literaltoboolconversion
Change-Id: Ic8d00f036ef439ae8e1184289edb3ba6a117e1f6
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index c34db4a..a92eb64 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -720,10 +720,10 @@ void SfxDocumentDescPage::Reset(const SfxItemSet rSet)
SFX_ITEMSET_ARG( rSet, pROItem, SfxBoolItem, SID_DOC_READONLY, false );
if ( pROItem pROItem-GetValue() )
{
-m_pTitleEd-SetReadOnly( sal_True );
-m_pThemaEd-SetReadOnly( sal_True );
-m_pKeywordsEd-SetReadOnly( sal_True );
-m_pCommentEd-SetReadOnly( sal_True );
+m_pTitleEd-SetReadOnly( true );
+m_pThemaEd-SetReadOnly( true );
+m_pKeywordsEd-SetReadOnly( true );
+m_pCommentEd-SetReadOnly( true );
}
}
@@ -1034,7 +1034,7 @@ void SfxDocumentPage::Reset( const SfxItemSet rSet )
aName = aURL.GetName( INetURLObject::DECODE_WITH_CHARSET );
if ( aName.isEmpty() || aURL.GetProtocol() == INET_PROT_PRIVATE )
aName = SfxResId( STR_NONAME ).toString();
-m_pNameED-SetReadOnly( sal_True );
+m_pNameED-SetReadOnly( true );
}
else
{
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 0350df0..78c1195 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -772,7 +772,7 @@ void SfxDockingWindow::EndDocking( const Rectangle rRect,
bool bFloatMode )
return;
SfxWorkWindow *pWorkWin = pBindings-GetWorkWindow_Impl();
-bool bReArrange = sal_False;
+bool bReArrange = false;
if ( pImp-bSplitable )
{
// If the alignment changes and the window is in a docked state in a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/window/gtksalframe.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit eb1bfe680ae2d0202dde67b762ed48f7192e63e4
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 12:19:19 2014 +0200
WaE: implicit conversion (IntegralCast) from bool to 'int'
Hack to avoid false positive from loplugin.
Change-Id: I2b25f06299e40ea0cb155a6b748f38e1cb1ffc0d
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index 547f543..7f7aeb5 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1362,7 +1362,8 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong
nStyle )
if( bDecoHandling )
{
-gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle
SAL_FRAME_STYLE_SIZEABLE) ? true : FALSE );
+// Using true or TRUE below causes a false warning from loplugin with
Clang 3.2
+gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle
SAL_FRAME_STYLE_SIZEABLE) ? 1 : FALSE );
if( ( (nStyle (SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ) )
lcl_set_accept_focus( GTK_WINDOW(m_pWindow), false, false );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|36799 | -- 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 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||36799 -- 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 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 ba...@quipo.it changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #192 from tommy27 ba...@quipo.it --- CLOSING since 4.0.x reached end of life. all still open bugs have been moved to the mab4.1 list. please do not add anymore bugs to the current list. -- 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 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 ba...@quipo.it changed: What|Removed |Added Status|RESOLVED|CLOSED -- 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: vcl/unx
vcl/unx/gtk/window/gtksalframe.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7c50556cd88e54726d03479ea852d2ea07497868 Author: Tor Lillqvist t...@collabora.com Date: Fri Feb 28 12:52:44 2014 +0200 WaE: implicit conversion (IntegralCast) from bool to 'int' Change-Id: I8094180c898c89351caa4805e395c3f3f2b0a946 diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 7f7aeb5..9f32854 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -3155,7 +3155,7 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent ) GdkEventFocus aEvent; aEvent.type = GDK_FOCUS_CHANGE; aEvent.window = widget_get_window( m_pWindow ); -aEvent.send_event = true; +aEvent.send_event = 1; aEvent.in = gint16(pEvent-xclient.data.l[1] == 1); signalFocus( m_pWindow, aEvent, this ); } ___ 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/fmcomp/gridcell.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 514f2c2dfa1ce32293622bbbcd3521f97d5c60ef Author: Tor Lillqvist t...@collabora.com Date: Fri Feb 28 12:54:00 2014 +0200 WaE: implicit conversion of literal of type 'sal_Bool' to 'bool' Change-Id: Icf1b8aa2c228daf8d9719616a6a91c5d6bef8449 diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 55fae78..402e203 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2903,7 +2903,7 @@ void DbFilterField::Init( Window rParent, const Reference XRowSet xCursor ) // filter cells are never readonly Edit* pAsEdit = dynamic_cast Edit* ( m_pWindow ); if ( pAsEdit ) -pAsEdit-SetReadOnly( sal_False ); +pAsEdit-SetReadOnly( false ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/canvasbitmaptest.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c28e4af6fe0e19f82b39aa0daa310eba8a3eebfe Author: Tor Lillqvist t...@collabora.com Date: Fri Feb 28 13:03:25 2014 +0200 WaE: implicit conversion (IntegralCast) from bool to 'int' Change-Id: I3431d256bde60a2b3fa8de9a0ef43d1a0f1dc3df diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx index f7da2df..3fac60c 100644 --- a/vcl/qa/cppunit/canvasbitmaptest.cxx +++ b/vcl/qa/cppunit/canvasbitmaptest.cxx @@ -196,7 +196,7 @@ void checkCanvasBitmap( const rtl::ReferenceVclCanvasBitmap xBmp, xPal-getNumberOfEntries() == 1L nOriginalDepth); uno::Sequencedouble aIndex; CPPUNIT_ASSERT_MESSAGE( Palette is not read-only, -xPal-setIndex(aIndex,true,0) == false); +xPal-setIndex(aIndex,true,0) == sal_False); CPPUNIT_ASSERT_MESSAGE( Palette entry 0 is not opaque, xPal-getIndex(aIndex,0)); CPPUNIT_ASSERT_MESSAGE( Palette has no valid color space, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa vcl/unx
vcl/qa/cppunit/canvasbitmaptest.cxx |2 +-
vcl/unx/gtk/window/gtksalframe.cxx |5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 35fb9ca387e6e977b873698e8f4f1c01d572ae8c
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Feb 28 12:14:18 2014 +0100
bool clean-up fixup
Change-Id: I0a302d7f91ef07992f95a8ccd48efec862519ab1
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx
b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 3fac60c..22f64bd 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -196,7 +196,7 @@ void checkCanvasBitmap( const
rtl::ReferenceVclCanvasBitmap xBmp,
xPal-getNumberOfEntries() == 1L
nOriginalDepth);
uno::Sequencedouble aIndex;
CPPUNIT_ASSERT_MESSAGE( Palette is not read-only,
-xPal-setIndex(aIndex,true,0) == sal_False);
+!xPal-setIndex(aIndex,true,0));
CPPUNIT_ASSERT_MESSAGE( Palette entry 0 is not opaque,
xPal-getIndex(aIndex,0));
CPPUNIT_ASSERT_MESSAGE( Palette has no valid color space,
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx
b/vcl/unx/gtk/window/gtksalframe.cxx
index 9f32854..55c592a 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1362,8 +1362,7 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong
nStyle )
if( bDecoHandling )
{
-// Using true or TRUE below causes a false warning from loplugin with
Clang 3.2
-gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle
SAL_FRAME_STYLE_SIZEABLE) ? 1 : FALSE );
+gtk_window_set_resizable( GTK_WINDOW(m_pWindow), (nStyle
SAL_FRAME_STYLE_SIZEABLE) != 0 );
if( ( (nStyle (SAL_FRAME_STYLE_OWNERDRAWDECORATION)) ) )
lcl_set_accept_focus( GTK_WINDOW(m_pWindow), false, false );
}
@@ -3155,7 +3154,7 @@ bool GtkSalFrame::Dispatch( const XEvent* pEvent )
GdkEventFocus aEvent;
aEvent.type = GDK_FOCUS_CHANGE;
aEvent.window = widget_get_window( m_pWindow );
-aEvent.send_event = 1;
+aEvent.send_event = gint8(TRUE);
aEvent.in = gint16(pEvent-xclient.data.l[1] == 1);
signalFocus( m_pWindow, aEvent, this );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/control/FieldDescControl.cxx |2 +-
dbaccess/source/ui/dlg/ConnectionPage.hxx |2 +-
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx |2 +-
dbaccess/source/ui/dlg/sqlmessage.cxx |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 278cc074512576676f0805016215bdcad73d9be2
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 13:13:47 2014 +0200
WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'
Change-Id: Ic46830dfdb82e4519cfccd5da3f673aec12fdfd8
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx
b/dbaccess/source/ui/control/FieldDescControl.cxx
index 3487c2f..0eb4ead 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -949,7 +949,7 @@ void OFieldDescControl::ActivateAggregate( EControlType
eType )
pFormatText = CreateText(STR_FORMAT);
pFormatSample = new OPropEditCtrl( this, STR_HELP_FORMAT_CODE, -1,
WB_BORDER );
-pFormatSample-SetReadOnly(sal_True);
+pFormatSample-SetReadOnly(true);
pFormatSample-Enable(false);
InitializeControl(pFormatSample,HID_TAB_ENT_FORMAT_SAMPLE,false);
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx
b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 7e84d47..8630771 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -62,7 +62,7 @@ namespace dbaui
virtual voidimplInitControls(const SfxItemSet _rSet, sal_Bool
_bSaveValue);
-inline void enableConnectionURL() {
m_aConnectionURL.SetReadOnly(sal_False); }
+inline void enableConnectionURL() {
m_aConnectionURL.SetReadOnly(false); }
inline void disableConnectionURL() { m_aConnectionURL.SetReadOnly(); }
/** changes the connection URL.
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index 08eb1fd..59cfa0f 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -56,7 +56,7 @@ namespace dbaui
virtual voidimplInitControls(const SfxItemSet _rSet, sal_Bool
_bSaveValue);
virtual sal_BoolcommitPage( ::svt::WizardTypes::CommitPageReason
_eReason );
-inline void enableConnectionURL() {
m_aConnectionURL.SetReadOnly(sal_False); }
+inline void enableConnectionURL() {
m_aConnectionURL.SetReadOnly(false); }
inline void disableConnectionURL() { m_aConnectionURL.SetReadOnly(); }
/** changes the connection URL.
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx
b/dbaccess/source/ui/dlg/sqlmessage.cxx
index eb3424c..8230d73 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -336,7 +336,7 @@ OExceptionChainDialog::OExceptionChainDialog( Window*
pParent, const ExceptionDi
m_aExceptionList.SetSelectHdl(LINK(this, OExceptionChainDialog,
OnExceptionSelected));
m_aExceptionList.SetNodeDefaultImages( );
-m_aExceptionText.SetReadOnly(sal_True);
+m_aExceptionText.SetReadOnly(true);
bool bHave22018 = false;
size_t elementPos = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/propctrlr/browserlistbox.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0e39eba09b87249431c0d105f4618337ae1895fe Author: Tor Lillqvist t...@collabora.com Date: Fri Feb 28 13:27:01 2014 +0200 WaE: implicit conversion of literal of type 'sal_Bool' to 'bool' Change-Id: I6a15e3e705015fdfa92e0606935af8b83cc9a183 diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 8a05357..0bdb27b 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -1199,7 +1199,7 @@ namespace pcr Window *pWindow = rLine.pLine-getControlWindow(); Edit* pControlWindowAsEdit = dynamic_castEdit*(pWindow); if (pControlWindowAsEdit) -pControlWindowAsEdit-SetReadOnly(sal_True); +pControlWindowAsEdit-SetReadOnly(true); else pWindow-Enable(false); } ___ 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/doc/docedt.cxx | 52 +++---
sw/source/core/doc/docredln.cxx| 16 ---
sw/source/core/edit/edundo.cxx |2
sw/source/core/inc/UndoRedline.hxx | 10 ++--
sw/source/core/undo/undobj.cxx | 84 -
sw/source/core/undo/unredln.cxx| 54 +++
6 files changed, 115 insertions(+), 103 deletions(-)
New commits:
commit 22aea93d508d8051a5f5d1a472874ba4eca2f296
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Thu Feb 27 14:00:06 2014 +
Related: #i123480# assure correct Undo/Redo with not shown tracked changes
(cherry picked from commit e8613c7e3b76a83d804d28199fdeacc6369569c6)
Conflicts:
sw/source/core/doc/docedt.cxx
sw/source/core/undo/undobj.cxx
sw/source/core/undo/unredln.cxx
Change-Id: I45c25aa957995109b202e2130e5344b1bbb09669
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 801593d..aa10b74 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -1480,52 +1480,50 @@ bool SwDoc::DeleteAndJoinWithRedlineImpl( SwPaM rPam,
const bool )
{
SwUndoRedlineDelete* pUndo = 0;
RedlineMode_t eOld = GetRedlineMode();
-checkRedlining(eOld);
+checkRedlining( eOld );
if (GetIDocumentUndoRedo().DoesUndo())
{
-/* please don't translate -- for cultural reasons this comment is protected
- until the redline implementation is finally fixed some day */
-//JP 06.01.98: MUSS noch optimiert werden!!!
-SetRedlineMode(
- (RedlineMode_t)(nsRedlineMode_t::REDLINE_ON |
nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE ));
+/* please don't translate -- for cultural reasons this comment is
protected
+ until the redline implementation is finally fixed some day */
+//JP 06.01.98: MUSS noch optimiert werden!!!
+SetRedlineMode(
+(RedlineMode_t) ( nsRedlineMode_t::REDLINE_ON |
nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE ) );
-GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL);
+GetIDocumentUndoRedo().StartUndo( UNDO_DELETE, NULL );
pUndo = new SwUndoRedlineDelete( rPam, UNDO_DELETE );
-GetIDocumentUndoRedo().AppendUndo(pUndo);
+GetIDocumentUndoRedo().AppendUndo( pUndo );
}
-if( *rPam.GetPoint() != *rPam.GetMark() )
-AppendRedline( new SwRangeRedline(
nsRedlineType_t::REDLINE_DELETE, rPam ), true);
+
+if ( *rPam.GetPoint() != *rPam.GetMark() )
+AppendRedline( new SwRangeRedline(
nsRedlineType_t::REDLINE_DELETE, rPam ), true );
SetModified();
-if( pUndo )
+if ( pUndo )
{
-GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL);
+GetIDocumentUndoRedo().EndUndo( UNDO_EMPTY, NULL );
// ??? why the hell is the AppendUndo not below the
// CanGrouping, so this hideous cleanup wouldn't be necessary?
// bah, this is redlining, probably changing this would break it...
-if (GetIDocumentUndoRedo().DoesGroupUndo())
+if ( GetIDocumentUndoRedo().DoesGroupUndo() )
{
-SwUndo *const pLastUndo( GetUndoManager().GetLastUndo() );
-SwUndoRedlineDelete *const pUndoRedlineDel(
-dynamic_castSwUndoRedlineDelete*(pLastUndo) );
-if (pUndoRedlineDel)
+SwUndo * const pLastUndo( GetUndoManager().GetLastUndo() );
+SwUndoRedlineDelete * const pUndoRedlineDel( dynamic_cast
SwUndoRedlineDelete* ( pLastUndo ) );
+if ( pUndoRedlineDel )
{
-bool const bMerged = pUndoRedlineDel-CanGrouping(*pUndo);
-if (bMerged)
+bool const bMerged = pUndoRedlineDel-CanGrouping( *pUndo
);
+if ( bMerged )
{
-::sw::UndoGuard const
undoGuard(GetIDocumentUndoRedo());
-SwUndo const*const pDeleted =
-GetUndoManager().RemoveLastUndo();
-OSL_ENSURE(pDeleted == pUndo,
-DeleteAndJoinWithRedlineImpl:
-undo removed is not undo inserted?);
+::sw::UndoGuard const undoGuard(
GetIDocumentUndoRedo() );
+SwUndo const* const pDeleted =
GetUndoManager().RemoveLastUndo();
+OSL_ENSURE( pDeleted == pUndo,
DeleteAndJoinWithRedlineImpl:
+undo removed is not undo inserted? );
delete pDeleted;
}
}
}
-//JP 06.01.98: MUSS noch optimiert werden!!!
-SetRedlineMode( eOld );
+
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e8/613c7e3b76a83d804d28199fdeacc6369569c6
e8/613c7e3b76a83d804d28199fdeacc6369569c6 |1 + 1 file changed, 1 insertion(+) New commits: commit 5abf822eade6ca3bd072646162a256bc6c75f841 Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 28 11:42:23 2014 + Notes added by 'git notes add' diff --git a/e8/613c7e3b76a83d804d28199fdeacc6369569c6 b/e8/613c7e3b76a83d804d28199fdeacc6369569c6 new file mode 100644 index 000..d54c0aa --- /dev/null +++ b/e8/613c7e3b76a83d804d28199fdeacc6369569c6 @@ -0,0 +1 @@ +merged as: 22aea93d508d8051a5f5d1a472874ba4eca2f296 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/salframe.cxx | 10 +-
vcl/osx/salinst.cxx |2 +-
vcl/osx/salobj.cxx |2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit d18529591e6879458ec594e7b09ff167791d5e2a
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 13:52:09 2014 +0200
sal_Bool/bool fallout
Change-Id: Id31598b9c6485ecddcbbc3b2f216f67daca9a795
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index f06ec70..e790bf1 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -424,7 +424,7 @@ void AquaSalFrame::SendPaintEvent( const Rectangle* pRect )
-void AquaSalFrame::Show(sal_Bool bVisible, sal_Bool bNoActivate)
+void AquaSalFrame::Show(bool bVisible, bool bNoActivate)
{
if ( !mpNSWindow )
return;
@@ -487,7 +487,7 @@ void AquaSalFrame::Show(sal_Bool bVisible, sal_Bool
bNoActivate)
-void AquaSalFrame::Enable( sal_Bool )
+void AquaSalFrame::Enable( bool )
{
}
@@ -850,7 +850,7 @@ public:
};
#endif
-void AquaSalFrame::StartPresentation( sal_Bool bStart )
+void AquaSalFrame::StartPresentation( bool bStart )
{
if ( !mpNSWindow )
return;
@@ -887,7 +887,7 @@ void AquaSalFrame::StartPresentation( sal_Bool bStart )
-void AquaSalFrame::SetAlwaysOnTop( sal_Bool )
+void AquaSalFrame::SetAlwaysOnTop( bool )
{
}
@@ -1684,7 +1684,7 @@ void AquaSalFrame::UpdateFrameGeometry()
-void AquaSalFrame::CaptureMouse( sal_Bool bCapture )
+void AquaSalFrame::CaptureMouse( bool bCapture )
{
/* Remark:
we'll try to use a pidgin version of capture mouse
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index a03346c..1eb1dff 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -819,7 +819,7 @@ void AquaSalInstance::DestroyFrame( SalFrame* pFrame )
-SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData*
/* pWindowData */, sal_Bool /* bShow */ )
+SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData*
/* pWindowData */, bool /* bShow */ )
{
// SystemWindowData is meaningless on Mac OS X
AquaSalObject *pObject = NULL;
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index 95bfe26..016979a 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -196,7 +196,7 @@ void AquaSalObject::setClippedPosSize()
-void AquaSalObject::Show( sal_Bool bVisible )
+void AquaSalObject::Show( bool bVisible )
{
if( mpClipView )
[mpClipView setHidden: (bVisible ? NO : YES)];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 159 ++-
sw/source/filter/ww8/docxattributeoutput.hxx |1
sw/source/filter/ww8/docxexport.cxx |3
3 files changed, 87 insertions(+), 76 deletions(-)
New commits:
commit c5ecd9d2a79d4c2cd80fc7d037074806a021e579
Author: Jacobo Aragunde Pérez jaragu...@igalia.com
Date: Fri Feb 28 10:51:48 2014 +0100
Correct indentation
Change-Id: I3ce85a17966c155c71cd3e3d1a142cc02ec34bd7
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index ed87bf2..d7d9dea 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3639,85 +3639,83 @@ void DocxAttributeOutput::WriteOLE( SwOLENode rNode,
const Size rSize, const S
break;
}
-// wrong indentation ahead
-
-SwOLEObj aObject = rNode.GetOLEObj();
-uno::Reference embed::XEmbeddedObject xObj( aObject.GetOleRef() );
-comphelper::EmbeddedObjectContainer* aContainer =
aObject.GetObject().GetContainer();
-OUString sObjectName = aContainer-GetEmbeddedObjectName( xObj );
-
-// set some attributes according to the type of the embedded object
-OUString sProgID, sMediaType, sRelationType;
-for( sal_Int32 i=0; i aObjectsInteropList.getLength(); ++i )
-if ( aObjectsInteropList[i].Name == sObjectName )
-{
-aObjectsInteropList[i].Value = sProgID;
-break;
-}
-if( sProgID.startsWith(Excel.Sheet) )
-{
-sMediaType =
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;
-sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/package;;
-}
-else if( sProgID.startsWith(PowerPoint.Show) )
-{
-sMediaType =
application/vnd.openxmlformats-officedocument.presentationml.presentation;
-sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/package;;
-}
-else
+SwOLEObj aObject = rNode.GetOLEObj();
+uno::Reference embed::XEmbeddedObject xObj( aObject.GetOleRef() );
+comphelper::EmbeddedObjectContainer* aContainer =
aObject.GetObject().GetContainer();
+OUString sObjectName = aContainer-GetEmbeddedObjectName( xObj );
+
+// set some attributes according to the type of the embedded object
+OUString sProgID, sMediaType, sRelationType;
+for( sal_Int32 i=0; i aObjectsInteropList.getLength(); ++i )
+if ( aObjectsInteropList[i].Name == sObjectName )
{
-sMediaType =
application/vnd.openxmlformats-officedocument.oleObject;
-sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject;;
+aObjectsInteropList[i].Value = sProgID;
+break;
}
+if( sProgID.startsWith(Excel.Sheet) )
+{
+sMediaType =
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;
+sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/package;;
+}
+else if( sProgID.startsWith(PowerPoint.Show) )
+{
+sMediaType =
application/vnd.openxmlformats-officedocument.presentationml.presentation;
+sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/package;;
+}
+else
+{
+sMediaType = application/vnd.openxmlformats-officedocument.oleObject;
+sRelationType =
http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject;;
+}
-// write embedded file
-OString sId = m_rExport.WriteOLEObject( aObject, sMediaType,
sRelationType );
+// write embedded file
+OString sId = m_rExport.WriteOLEObject( aObject, sMediaType, sRelationType
);
-if( sId.isEmpty() )
-{
-// the embedded file could not be saved
-// fallback: save as an image
-FlyFrameGraphic( 0, rSize, rFlyFrmFmt, rNode );
-return;
-}
+if( sId.isEmpty() )
+{
+// the embedded file could not be saved
+// fallback: save as an image
+FlyFrameGraphic( 0, rSize, rFlyFrmFmt, rNode );
+return;
+}
+
+// write preview image
+const Graphic* pGraphic = rNode.GetGraphic();
+OUString sImageId = m_rDrawingML.WriteImage( *pGraphic );
+
+m_pSerializer-startElementNS( XML_w, XML_object, FSEND );
+
+OStringBuffer sShapeStyle, sShapeId;
+sShapeStyle.append( width: ).append( double( rSize.Width() ) / 20 )
+.append( pt;height: ).append( double( rSize.Height()
) / 20 )
+.append( pt ); //from
VMLExport::AddRectangleDimensions(), it does: value/20
+sShapeId.append( ole_ ).append( sId );
+
+// shape definition
+m_pSerializer-startElementNS( XML_v, XML_shape,
+
[Libreoffice-commits] core.git: sd/source
sd/source/ui/unoidl/sddetect.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 757996c46e09e6a14e15ee8ce2a993c0ec3b79f8
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 14:04:46 2014 +0200
WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'
Change-Id: If6112c0b91bd040830818a69e599dfbce315d271
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index b035660..1d957b3 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -395,7 +395,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence
beans::PropertyValue lDes
const OUString aFileName(
aMedium.GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
GraphicDescriptor aDesc( *pStm, aFileName );
-if( !aDesc.Detect( sal_False ) )
+if( !aDesc.Detect( false ) )
{
pFilter = 0;
if( SvtModuleOptions().IsImpress() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source sw/qa
include/oox/drawingml/textcharacterproperties.hxx|3 ++
oox/source/drawingml/textcharacterproperties.cxx | 19 ---
oox/source/drawingml/textcharacterpropertiescontext.cxx | 12 +
oox/source/drawingml/theme.cxx | 17 -
sw/qa/extras/ooxmlexport/data/groupshape-theme-font.docx |binary
sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx | 10 +++
6 files changed, 57 insertions(+), 4 deletions(-)
New commits:
commit 440fbd609054d78e37f4953dfdde8c79c10b4981
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Feb 28 12:17:51 2014 +0100
DOCX import: handle font theme references in group shape text
Change-Id: I1d5b86ad17b2c4a0945f483c94ac6abf410cf1d6
diff --git a/include/oox/drawingml/textcharacterproperties.hxx
b/include/oox/drawingml/textcharacterproperties.hxx
index c079015..bddd25c 100644
--- a/include/oox/drawingml/textcharacterproperties.hxx
+++ b/include/oox/drawingml/textcharacterproperties.hxx
@@ -36,8 +36,11 @@ struct TextCharacterProperties
{
PropertyMap maHyperlinkPropertyMap;
TextFontmaLatinFont;
+TextFontmaLatinThemeFont;
TextFontmaAsianFont;
+TextFontmaAsianThemeFont;
TextFontmaComplexFont;
+TextFontmaComplexThemeFont;
TextFontmaSymbolFont;
Color maCharColor;
Color maUnderlineColor;
diff --git a/oox/source/drawingml/textcharacterproperties.cxx
b/oox/source/drawingml/textcharacterproperties.cxx
index 1ad0bae..b782761 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -44,8 +44,11 @@ void TextCharacterProperties::assignUsed( const
TextCharacterProperties rSource
// overwrite all properties exisiting in rSourceProps
maHyperlinkPropertyMap.insert(
rSourceProps.maHyperlinkPropertyMap.begin(),
rSourceProps.maHyperlinkPropertyMap.end() );
maLatinFont.assignIfUsed( rSourceProps.maLatinFont );
+maLatinThemeFont.assignIfUsed( rSourceProps.maLatinThemeFont );
maAsianFont.assignIfUsed( rSourceProps.maAsianFont );
+maAsianThemeFont.assignIfUsed( rSourceProps.maAsianThemeFont );
maComplexFont.assignIfUsed( rSourceProps.maComplexFont );
+maComplexThemeFont.assignIfUsed( rSourceProps.maComplexThemeFont );
maSymbolFont.assignIfUsed( rSourceProps.maSymbolFont );
maCharColor.assignIfUsed( rSourceProps.maCharColor );
maHighlightColor.assignIfUsed( rSourceProps.maHighlightColor );
@@ -68,21 +71,31 @@ void TextCharacterProperties::pushToPropMap( PropertyMap
rPropMap, const XmlFil
sal_Int16 nFontPitch = 0;
sal_Int16 nFontFamily = 0;
-if( maLatinFont.getFontData( aFontName, nFontPitch, nFontFamily, rFilter )
)
+bool bRet = maLatinFont.getFontData( aFontName, nFontPitch, nFontFamily,
rFilter );
+if (!bRet)
+// In case there is no direct font, try to look it up as a theme
reference.
+bRet = maLatinThemeFont.getFontData( aFontName, nFontPitch,
nFontFamily, rFilter );
+if (bRet)
{
rPropMap[ PROP_CharFontName ] = aFontName;
rPropMap[ PROP_CharFontPitch ] = nFontPitch;
rPropMap[ PROP_CharFontFamily ] = nFontFamily;
}
-if( maAsianFont.getFontData( aFontName, nFontPitch, nFontFamily, rFilter )
)
+bRet = maAsianFont.getFontData( aFontName, nFontPitch, nFontFamily,
rFilter );
+if (!bRet)
+bRet = maAsianThemeFont.getFontData( aFontName, nFontPitch,
nFontFamily, rFilter );
+if (bRet)
{
rPropMap[ PROP_CharFontNameAsian ] = aFontName;
rPropMap[ PROP_CharFontPitchAsian ] = nFontFamily;
rPropMap[ PROP_CharFontFamilyAsian ] = nFontPitch;
}
-if( maComplexFont.getFontData( aFontName, nFontPitch, nFontFamily, rFilter
) )
+bRet = maComplexFont.getFontData( aFontName, nFontPitch, nFontFamily,
rFilter );
+if (!bRet)
+bRet = maComplexThemeFont.getFontData( aFontName, nFontPitch,
nFontFamily, rFilter );
+if (bRet)
{
rPropMap[ PROP_CharFontNameComplex ] = aFontName;
rPropMap[ PROP_CharFontPitchComplex ] = nFontPitch;
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx
b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 8b6156e..cde4a63 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -136,14 +136,26 @@ ContextHandlerRef
TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl
{
mrTextCharacterProperties.maLatinFont.setAttributes(rAttribs.getString(OOX_TOKEN(doc,
ascii), OUString()));
}
+if (rAttribs.hasAttribute(OOX_TOKEN(doc, asciiTheme)))
+{
+
mrTextCharacterProperties.maLatinThemeFont.setAttributes(rAttribs.getString(OOX_TOKEN(doc,
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/undobj.hxx |2 +-
sw/source/core/undo/undobj.cxx |5 ++---
sw/source/core/undo/unredln.cxx |8 +++-
3 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 3d66457b0b64660815b1c52698cd9dd92726d044
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Feb 28 14:04:26 2014 +0100
-Werror,-Wunused-parameter
Change-Id: Ib468220253c494279cfd4f46235a91522fb0889c
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 751be36..19889a9 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -115,7 +115,7 @@ public:
// Save and set Redline data.
static sal_Bool FillSaveData( const SwPaM rRange, SwRedlineSaveDatas
rSData,
-sal_Bool bDelRange = sal_True, sal_Bool bCopyNext
= sal_True );
+sal_Bool bDelRange = sal_True );
static sal_Bool FillSaveDataForFmt( const SwPaM , SwRedlineSaveDatas );
static void SetSaveData( SwDoc rDoc, const SwRedlineSaveDatas rSData );
static sal_Bool HasHiddenRedlines( const SwRedlineSaveDatas rSData );
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index b20d91c..35cd84f 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -848,7 +848,7 @@ void SwUndoSaveSection::SaveSection(
}
pRedlSaveData = new SwRedlineSaveDatas;
-if( !SwUndo::FillSaveData( aPam, *pRedlSaveData, sal_True, sal_True ))
+if( !SwUndo::FillSaveData( aPam, *pRedlSaveData, sal_True ))
delete pRedlSaveData, pRedlSaveData = 0;
nStartPos = rRange.aStart.GetIndex();
@@ -997,8 +997,7 @@ void SwRedlineSaveData::RedlineToDoc( SwPaM rPam )
sal_Bool SwUndo::FillSaveData(
const SwPaM rRange,
SwRedlineSaveDatas rSData,
-sal_Bool bDelRange,
-sal_Bool /* bCopyNext */ )
+sal_Bool bDelRange )
{
rSData.DeleteAndDestroyAll();
diff --git a/sw/source/core/undo/unredln.cxx b/sw/source/core/undo/unredln.cxx
index a7df649..465fd68 100644
--- a/sw/source/core/undo/unredln.cxx
+++ b/sw/source/core/undo/unredln.cxx
@@ -58,8 +58,7 @@ SwUndoRedline::SwUndoRedline( SwUndoId nUsrId, const SwPaM
rRange )
sal_uLong nEndExtra = rDoc.GetNodes().GetEndOfExtras().GetIndex();
mpRedlSaveData = new SwRedlineSaveDatas;
-if( !FillSaveData( rRange, *mpRedlSaveData, sal_False,
-UNDO_REJECT_REDLINE != mnUserId ))
+if( !FillSaveData( rRange, *mpRedlSaveData, sal_False ))
delete mpRedlSaveData, mpRedlSaveData = 0;
else
{
@@ -117,8 +116,7 @@ void SwUndoRedline::RedoImpl(::sw::UndoRedoContext
rContext)
if( mpRedlSaveData mbHiddenRedlines )
{
sal_uLong nEndExtra = pDoc-GetNodes().GetEndOfExtras().GetIndex();
-FillSaveData(rPam, *mpRedlSaveData, sal_False,
-UNDO_REJECT_REDLINE != mnUserId );
+FillSaveData(rPam, *mpRedlSaveData, sal_False );
nEndExtra -= pDoc-GetNodes().GetEndOfExtras().GetIndex();
nSttNode -= nEndExtra;
@@ -381,7 +379,7 @@ SwUndoCompDoc::SwUndoCompDoc( const SwRangeRedline rRedl )
}
pRedlSaveData = new SwRedlineSaveDatas;
-if( !FillSaveData( rRedl, *pRedlSaveData, sal_False, sal_True ))
+if( !FillSaveData( rRedl, *pRedlSaveData, sal_False ))
delete pRedlSaveData, pRedlSaveData = 0;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/generic/gendisp.hxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 69a7d9aea25240ababb298e5b8a89d2492057ca6
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 15:38:15 2014 +0200
Unvirtualize a couple of functions
Change-Id: I1df9d7d1f0186a6983e54906c2d1b1684663826d
diff --git a/vcl/inc/generic/gendisp.hxx b/vcl/inc/generic/gendisp.hxx
index 4aa5f35..2c5b5ec 100644
--- a/vcl/inc/generic/gendisp.hxx
+++ b/vcl/inc/generic/gendisp.hxx
@@ -56,17 +56,17 @@ public:
inline void EventGuardAcquire() { osl_acquireMutex( m_aEventGuard ); }
inline void EventGuardRelease() { osl_releaseMutex( m_aEventGuard ); }
-virtual void registerFrame( SalFrame* pFrame );
+void registerFrame( SalFrame* pFrame );
virtual void deregisterFrame( SalFrame* pFrame );
-void emitDisplayChanged();
+void emitDisplayChanged();
// Event handling
virtual void PostUserEvent() = 0;
-virtual void SendInternalEvent( SalFrame* pFrame, void* pData, sal_uInt16
nEvent = SALEVENT_USEREVENT );
-virtual void CancelInternalEvent( SalFrame* pFrame, void* pData,
sal_uInt16 nEvent );
-virtual bool DispatchInternalEvent();
-bool HasUserEvents() const;
+void SendInternalEvent( SalFrame* pFrame, void* pData, sal_uInt16 nEvent =
SALEVENT_USEREVENT );
+void CancelInternalEvent( SalFrame* pFrame, void* pData, sal_uInt16 nEvent
);
+bool DispatchInternalEvent();
+bool HasUserEvents() const;
bool MouseCaptured( const SalFrame *pFrameData ) const
{ return m_pCapture == pFrameData; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: GSoC 2014 Fresh Ideas
Hello Cedric, Can you please explain the procedure as required by libreoffice. I understand that I need to submit a bug fix. How can I find a mentor? What are your working hours(in GMT or IST)?(I live in India and am finding it difficult to synchronize with the team.) 2) Writer - Advanced Text Shadows I wish to implement advanced text shadows as a part of formatting characters. The new text shadow would be more customizable. The user will be able to control relative x, y positioning, blur radius, colour of the shadow. We could render a toolbar button for the same if possible. Looks interesting, but not that easy. It may also require you to work on an ODF change proposition. I hope you are aware of the fact that all application submissions need to come with a solved easy hack or fixed bug in order to be complete. That means you need to build and hack LibreOffice before submitting the application. Regards, Ashutosh Agarwal, IInd Year BTech, Computer Science and Engineering, Indian Institute of Technology, Patna. Email: ashutosh.e...@iitp.ac.in Ph: +91-9453012060 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
BuildBot BUG
On Thu Feb 27 08:49:36 PST 2014, Alexandre Vicenzi wrote: Hi folks, The buildbot is adding broken links in the history. It's aways showing this link: https://ci.libreoffice.org/job/buildbot/0 Can someone take a look? Short story: we have found the problem and hope to solve it today. Long story: Gerrit/Jenkins bridge is implemented as a new SSH command, that we have contributed to Jenkins's external-jobs-plugin [1]. The pristine version of this command used return code from SSH command to report build number back to buildbot/gerrit. During review process of our patch, it was argued, that this was a bad idea, and it was changed to report over stdout instead and returning always 0: [2]. We have never adjusted buildbot for that change of external-jobs-plugin's SSH command and used our own home backed version of Jenkin's external-jobs-plugin. Recently Jenkins machine had a reboot. During this reboot for some reasons that i don't understand Jenkins was upgraded. And with it the core external-jobs-plugin. Now, we have a mismatch between buildbot and external-jobs-plugin: the return code is always 0, and stdout from that call is ignored. [1] https://wiki.jenkins-ci.org/display/JENKINS/Monitoring+external+jobs#Monitoringexternaljobs-SubmitarunperCLI [2] https://github.com/davido/gerrit-buildbot-plugin/blob/buildbot-2.5-plugin/src/main/java/org/libreoffice/ci/gerrit/buildbot/publisher/JenkinsLogPublisher.java ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: GSoC 2014 Fresh Ideas
Hello, On Fri, 2014-02-28 at 14:58 +0530, Ashutosh Agarwal wrote: Can you please explain the procedure as required by libreoffice. I understand that I need to submit a bug fix. How can I find a mentor? What are your working hours(in GMT or IST)?(I live in India and am finding it difficult to synchronize with the team.) The procedure is detailled here: https://wiki.documentfoundation.org/Development/GSoC#How_to_apply Most of the hackers are located in Europe, but not everybody works on LibreOffice during business hours ;) -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc vcl/osx vcl/quartz
vcl/inc/osx/a11yfocustracker.hxx | 14 ++--- vcl/inc/osx/a11ylistener.hxx |4 - vcl/inc/osx/salframe.h| 98 ++ vcl/inc/osx/salinst.h | 82 +++ vcl/inc/osx/salmenu.h | 35 ++--- vcl/inc/osx/salobj.h | 16 +++--- vcl/inc/osx/salprn.h | 36 ++--- vcl/inc/osx/salsys.h |8 +-- vcl/osx/DataFlavorMapping.cxx | 20 +++ vcl/osx/DragSource.hxx| 18 +++--- vcl/osx/DragSourceContext.hxx |8 +-- vcl/osx/DropTarget.hxx| 44 - vcl/osx/OSXTransferable.hxx |6 +- vcl/osx/a11yfocuslistener.hxx |6 +- vcl/osx/clipboard.hxx | 20 +++ vcl/osx/documentfocuslistener.hxx |4 - vcl/osx/salframe.cxx | 21 vcl/osx/salinst.cxx | 32 +--- vcl/osx/salnativewidgets.cxx |2 vcl/quartz/salbmp.cxx | 42 20 files changed, 233 insertions(+), 283 deletions(-) New commits: commit ce433069f1b1c39ba368d5d2fc8008b6e9148324 Author: Tor Lillqvist t...@collabora.com Date: Fri Feb 28 14:27:15 2014 +0200 Add SAL_OVERRIDE markup for the vcl OS X and iOS code, and follow-up cleanup Thanks to SAL_OVERRIDE, I found a couple of unused functions and several that were virtual even if they did not override anything and were not overridden in any derived class. Change-Id: I598d2fc38f75a384c52359546a973e772393 diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx index f1bae09..2b5e96f 100644 --- a/vcl/inc/osx/a11yfocustracker.hxx +++ b/vcl/inc/osx/a11yfocustracker.hxx @@ -55,25 +55,25 @@ public: protected: // received a WINDOW_GETFOCUS event for this window -virtual void window_got_focus(Window *pWindow); +void window_got_focus(Window *pWindow); // received a TOOLBOX_HIGHLIGHT event for this window -virtual void toolbox_highlight_on(Window *pWindow); +void toolbox_highlight_on(Window *pWindow); // received a TOOLBOX_HIGHLIGHTOFF event for this window -virtual void toolbox_highlight_off(Window *pWindow); +void toolbox_highlight_off(Window *pWindow); // received a TABPAGE_ACTIVATE event for this window -virtual void tabpage_activated(Window *pWindow); +void tabpage_activated(Window *pWindow); // received a MENU_HIGHLIGHT event for this window -virtual void menu_highlighted(const ::VclMenuEvent *pEvent); +void menu_highlighted(const ::VclMenuEvent *pEvent); // toolbox items are widgets in gtk+ and Cocoa -virtual void notify_toolbox_item_focus(ToolBox *pToolBox); +void notify_toolbox_item_focus(ToolBox *pToolBox); // toolbox item opened a floating window (e.g. color chooser) -virtual void toolbox_open_floater(Window *pWindow); +void toolbox_open_floater(Window *pWindow); // callback function for Application::addEventListener static long WindowEventHandler(AquaA11yFocusTracker *pFocusTracker, ::VclSimpleEvent const *pEvent); diff --git a/vcl/inc/osx/a11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx index 7d15345..503e986 100644 --- a/vcl/inc/osx/a11ylistener.hxx +++ b/vcl/inc/osx/a11ylistener.hxx @@ -42,11 +42,11 @@ public: // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject Source ) -throw (::com::sun::star::uno::RuntimeException, std::exception); +throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEventListener virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject aEvent ) -throw( ::com::sun::star::uno::RuntimeException, std::exception ); +throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: const id m_wrapperObject; diff --git a/vcl/inc/osx/salframe.h b/vcl/inc/osx/salframe.h index bbd638b..ff7c972 100644 --- a/vcl/inc/osx/salframe.h +++ b/vcl/inc/osx/salframe.h @@ -112,62 +112,60 @@ public: virtual ~AquaSalFrame(); -virtual SalGraphics*GetGraphics(); -virtual voidReleaseGraphics( SalGraphics* pGraphics ); -virtual boolPostEvent( void* pData ); -virtual voidSetTitle( const OUString rTitle ); -virtual voidSetIcon( sal_uInt16 nIcon ); -virtual voidSetRepresentedURL( const OUString ); -virtual voidSetMenu( SalMenu* pSalMenu ); -virtual voidDrawMenuBar(); -virtual voidShow( bool bVisible, bool bNoActivate = false ); -virtual voidEnable( bool bEnable ); -virtual voidSetMinClientSize( long nWidth, long nHeight ); -virtual voidSetMaxClientSize( long nWidth, long
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/ios/iosinst.hxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 82149fe8885ca00c08d21b19d1ab45d6d8b09ff8 Author: Tor Lillqvist t...@collabora.com Date: Fri Feb 28 16:44:28 2014 +0200 Add SAL_OVERRIDE Change-Id: I3b85e2524ce5d8c643daa593e179c22c4c49608f diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx index 5d4ad0c..a91b6fc 100644 --- a/vcl/inc/ios/iosinst.hxx +++ b/vcl/inc/ios/iosinst.hxx @@ -39,14 +39,12 @@ public: virtual ~IosSalInstance(); static IosSalInstance *getInstance(); -virtual SalSystem* CreateSalSystem(); +virtual SalSystem* CreateSalSystem() SAL_OVERRIDE; void GetWorkArea( Rectangle rRect ); SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ); SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ); -// virtual bool AnyInput( sal_uInt16 nType ); - SalFrame *getFocusFrame() const; void damaged( IosSalFrame *frame, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Bug 73552 - Set name of CSV import sheet to something friendly
Hi voilavoila28, On Friday, 2014-02-28 05:28:35 +0800, voilavoil...@yahoo.in wrote: 0001-Set-name-of-CSV-import-sheet-to-something-friendly.patch There was no patch attached to your mail. If possible we'd prefer a patch submission to gerrit, see https://wiki.documentfoundation.org/Development/gerrit Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpyejfPC_gx5.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/undo/undobj.cxx |2 +-
sw/source/ui/frmdlg/frmpage.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2df809f4a3671720b15de3c44185766d09e4c425
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 14:47:32 2014 +0200
WaE: unused parameter 'bCopyNext'
Change-Id: Ic455c6f7a40d8f96335ecda37084ff7c0ef601a5
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 9f45a4a..b20d91c 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -998,7 +998,7 @@ sal_Bool SwUndo::FillSaveData(
const SwPaM rRange,
SwRedlineSaveDatas rSData,
sal_Bool bDelRange,
-sal_Bool bCopyNext )
+sal_Bool /* bCopyNext */ )
{
rSData.DeleteAndDestroyAll();
commit dc23ea1522f5304944ef9ade4cd2a722db2e3505
Author: Tor Lillqvist t...@collabora.com
Date: Fri Feb 28 14:45:04 2014 +0200
WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'
Change-Id: Ide2bd5caf2d6920c99400fbad290349d7dcca464
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 8c98fd6..040cbc8 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2420,7 +2420,7 @@ void SwGrfExtPage::Reset(const SfxItemSet rSet)
((const SfxBoolItem *)pItem)-GetValue() )
{
m_pBrowseBT-Enable();
-m_pConnectED-SetReadOnly(sal_False);
+m_pConnectED-SetReadOnly(false);
}
ActivatePage(rSet);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: STL iterators and for loops
On Fri, 2014-02-28 at 10:06 +0100, Stephan Bergmann wrote: On 02/28/2014 06:42 AM, Tor Lillqvist wrote: My builds with --enable-dbgutil are noticeably slow, OTOH, hoisting vec.end() so that is is called only once should be a quite mechanical task, Mechanical tasks are typically those where it is very easy to miss some crucial detail in some case and introduce a bug. ...like cases that purposefully keep re-evaluating end() because it gets invalidated in the loop's body. Also, hoisting the variable typically doesn't make the code more readable, and all this will eventually become moot with C++11 anyway. Stephan Thank you, Tor and Stephan. Terry. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - writerperfect/source
writerperfect/source/common/DirectoryStream.cxx | 17 -
writerperfect/source/common/WPXSvStream.cxx |7 ++-
2 files changed, 6 insertions(+), 18 deletions(-)
New commits:
commit c4d3ea46ab62a2ba5d69ae79aa6828b5b7ae6cbe
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sat Mar 1 00:28:28 2014 +0900
Call it noncopyable
Change-Id: If2e14b333868bb10867e54cd28c83d0d2c6a5e43
diff --git a/writerperfect/source/common/WPXSvStream.cxx
b/writerperfect/source/common/WPXSvStream.cxx
index f20deb6..818830d 100644
--- a/writerperfect/source/common/WPXSvStream.cxx
+++ b/writerperfect/source/common/WPXSvStream.cxx
@@ -23,6 +23,7 @@
#include limits
#include vector
+#include boost/noncopyable.hpp
#include boost/scoped_ptr.hpp
#include boost/unordered_map.hpp
@@ -36,12 +37,8 @@ namespace packages = com::sun::star::packages;
namespace
{
-class PositionHolder
+class PositionHolder : boost::noncopyable
{
-// disable copying
-PositionHolder(const PositionHolder );
-PositionHolder operator=(const PositionHolder );
-
public:
explicit PositionHolder(const ReferenceXSeekable rxSeekable);
~PositionHolder();
commit 83f1151c706eb78e08d781245ccabdc68aa0ee83
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sat Mar 1 00:18:06 2014 +0900
catch exception by const ref
Change-Id: Id0a9e3b52cabff7be99a5bba6ddb0a108a325d42
diff --git a/writerperfect/source/common/DirectoryStream.cxx
b/writerperfect/source/common/DirectoryStream.cxx
index ff93e26..90aeb59 100644
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -76,11 +76,11 @@ uno::Referenceio::XInputStream
findStream(ucbhelper::Content rContent, const
} while (xResultSet-next());
}
}
-catch (uno::RuntimeException)
+catch (const uno::RuntimeException )
{
// ignore
}
-catch (uno::Exception)
+catch (const uno::Exception )
{
// ignore
}
commit 6e9b859fa1c6ba2f94b46ac272372e0a503075c4
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sat Mar 1 00:15:25 2014 +0900
Drop useless const
Change-Id: Ifcdd921b08af10ff17dc3da7b811b6aed74baf98
diff --git a/writerperfect/source/common/DirectoryStream.cxx
b/writerperfect/source/common/DirectoryStream.cxx
index 7251d72..ff93e26 100644
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -129,13 +129,13 @@ WPXInputStream
*DirectoryStream::getDocumentOLEStream(const char *const pName)
return input;
}
-const unsigned char *DirectoryStream::read(const unsigned long, unsigned long
nNumBytesRead)
+const unsigned char *DirectoryStream::read(unsigned long, unsigned long
nNumBytesRead)
{
nNumBytesRead = 0;
return 0;
}
-int DirectoryStream::seek(const long, const WPX_SEEK_TYPE)
+int DirectoryStream::seek(long, WPX_SEEK_TYPE)
{
return -1;
}
commit 29c71853c469cbe7fc5f0439f6d6b5dedfe6a0fb
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sat Mar 1 00:10:49 2014 +0900
Remove unused struct
Change-Id: I217620ea99c809b7f3bf1a403170168ac01ed06a
diff --git a/writerperfect/source/common/DirectoryStream.cxx
b/writerperfect/source/common/DirectoryStream.cxx
index 14b37f3..7251d72 100644
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -49,15 +49,6 @@ namespace writerperfect
namespace
{
-struct NotADirectoryException
-{
-};
-
-}
-
-namespace
-{
-
uno::Referenceio::XInputStream findStream(ucbhelper::Content rContent,
const rtl::OUString rName)
{
uno::Referenceio::XInputStream xInputStream;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9beccfbd3793c86e1f6c4187c159e8a4c0bbba3a
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Feb 28 16:51:36 2014 +0100
writerfilter: undocumented class
Change-Id: I6c7774cacba116ccdea10d17afcca67883bb56a5
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 3a7e3ed..cbc8ed9 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -285,7 +285,7 @@ namespace writerfilter {
bool bStartedTrackchange; /// Track change is started, need
to end it before popping.
};
-// if std::stack had an operator[] this would be unnecessary...
+/// An RTF stack is similar to std::stack, except that it has an
operator[].
struct RTFStack : public std::dequeRTFParserState
{
RTFParserState top() { return back(); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/aqua/NSURL_OOoAdditions.mm | 20
1 file changed, 20 insertions(+)
New commits:
commit e53eacb13369e713c20153ea84caae6d8505f239
Author: Douglas Mencken dougmenc...@gmail.com
Date: Fri Feb 28 09:13:20 2014 -0500
Use FSResolveAliasFile at least on OS X 10.6
(see also: commit 7aa42913bb1828b877c2f73b4fe59cc3c65a67bf)
Change-Id: I6b8945bfcfce277eefdd54d25c7827c2ae19ef16
Reviewed-on: https://gerrit.libreoffice.org/8394
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm
b/fpicker/source/aqua/NSURL_OOoAdditions.mm
index 858eb27..80acb10 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm
@@ -83,6 +83,25 @@ NSString* resolveAlias( NSString* i_pSystemPath )
kCFURLPOSIXPathStyle,
false);
if( rUrl != NULL )
{
+#if MAC_OS_X_VERSION_MAX_ALLOWED 1060
+FSRef rFS;
+if( CFURLGetFSRef( rUrl, rFS ) )
+{
+Boolean bIsFolder = false;
+Boolean bAlias = false;
+OSErr err = FSResolveAliasFile( rFS, true, bIsFolder, bAlias);
+if( (err == noErr) bAlias )
+{
+CFURLRef rResolvedUrl = CFURLCreateFromFSRef(
kCFAllocatorDefault, rFS );
+if( rResolvedUrl != NULL )
+{
+pResolvedPath = (NSString*)CFURLCopyFileSystemPath(
rResolvedUrl, kCFURLPOSIXPathStyle );
+CFRelease( rResolvedUrl );
+}
+}
+}
+CFRelease( rUrl );
+#else
CFErrorRef rError;
CFDataRef rBookmark = CFURLCreateBookmarkDataFromFile( NULL, rUrl,
rError );
CFRelease( rUrl );
@@ -102,6 +121,7 @@ NSString* resolveAlias( NSString* i_pSystemPath )
CFRelease( rResolvedUrl );
}
}
+#endif
}
return pResolvedPath;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sal/rtl svgio/source
sal/rtl/uri.cxx | 21 -
svgio/source/svgreader/svgimagenode.cxx | 15 ++-
2 files changed, 26 insertions(+), 10 deletions(-)
New commits:
commit 51f73a9be8270487885d185eaa3dda13ec43d9b0
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Feb 28 17:49:40 2014 +0100
Simplify string construction
Change-Id: Ib46a64d8438dcaba37a234460d1a4113707e8c43
diff --git a/sal/rtl/uri.cxx b/sal/rtl/uri.cxx
index 513fb51..774c5f7 100644
--- a/sal/rtl/uri.cxx
+++ b/sal/rtl/uri.cxx
@@ -708,20 +708,23 @@ sal_Bool SAL_CALL rtl_uriConvertRelToAbs(rtl_uString *
pBaseUriRef,
parseUriRef(pBaseUriRef, aBaseComponents);
if (!aBaseComponents.aScheme.isPresent())
{
-rtl::OUString aMessage(pBaseUriRef);
-aMessage += rtl::OUString(
- does not start with a scheme component);
-rtl_uString_assign(pException,
- const_cast rtl::OUString (aMessage).pData);
+rtl_uString_assign(
+pException,
+(rtl::OUString(
+ + rtl::OUString(pBaseUriRef)
++ does not start with a scheme component)
+ .pData));
return false;
}
if (aBaseComponents.aPath.pBegin != aBaseComponents.aPath.pEnd
*aBaseComponents.aPath.pBegin != '/')
{
-rtl::OUString aMessage(pBaseUriRef);
-aMessage += rtl::OUString(
-path component does not start with slash);
-rtl_uString_assign(pException, aMessage.pData);
+rtl_uString_assign(
+pException,
+(rtl::OUString(
+ + rtl::OUString(pBaseUriRef)
++ path component does not start with a slash)
+ .pData));
return false;
}
commit 29c3bb0968cb9770f7b822f5cf466314be9db825
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Feb 28 17:43:23 2014 +0100
Handle vnd.sun.star.Package: URLs provoking MalrformedUriException
...as e.g. happens when loading an .odt containing a Pcitures/XXX.svg stream
which in turn contains an image xlink:href=logo.gif/ with relative URL,
e.g.
when loading the .odt generated by the instructions in fdo#75582.
Change-Id: I0d275662259bba8d582e2bd4671f0f6667060132
diff --git a/svgio/source/svgreader/svgimagenode.cxx
b/svgio/source/svgreader/svgimagenode.cxx
index 9ee155b..9cdb59a 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -237,7 +237,20 @@ namespace svgio
if (!rPath.isEmpty())
{
-const OUString
aAbsUrl(rtl::Uri::convertRelToAbs(rPath, maUrl));
+OUString aAbsUrl;
+try {
+aAbsUrl = rtl::Uri::convertRelToAbs(
+rPath, maUrl);
+} catch (rtl::MalformedUriException e) {
+// Happens for the odd maUrl =
+// vnd.sun.star.Package:Pictures/... scheme
+// using path components not starting with a
+// slash by mis-design:
+SAL_INFO(
+svg,
+caught rtl::MalformedUriException \
+ e.getMessage() \);
+}
if (!aAbsUrl.isEmpty())
{
___
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' - 90/3afaa8ea0766e01ba41a227d2794c2c40b129a
90/3afaa8ea0766e01ba41a227d2794c2c40b129a |1 + 1 file changed, 1 insertion(+) New commits: commit 88e2a8bd9aa9693b38f4e331843ac37f6c56e2e7 Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 28 16:51:32 2014 + Notes added by 'git notes add' diff --git a/90/3afaa8ea0766e01ba41a227d2794c2c40b129a b/90/3afaa8ea0766e01ba41a227d2794c2c40b129a new file mode 100644 index 000..6aa6504 --- /dev/null +++ b/90/3afaa8ea0766e01ba41a227d2794c2c40b129a @@ -0,0 +1 @@ +merged as: b1cf64fe51fd0bb1e9bc8c3bb38d5cc7254d8d5f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - cui/uiconfig sd/source sw/uiconfig ucb/source
cui/uiconfig/ui/connpooloptions.ui| 92 +-- sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |2 sd/source/ui/view/drviews1.cxx| 14 sd/source/ui/view/drviews2.cxx| 18 sd/source/ui/view/drviews3.cxx| 29 - sd/source/ui/view/drviews4.cxx|6 sd/source/ui/view/drviews7.cxx| 29 - sd/source/ui/view/drviewsb.cxx|6 sw/uiconfig/swriter/ui/optredlinepage.ui | 392 +++--- ucb/source/ucp/ftp/ftpurl.hxx |6 10 files changed, 339 insertions(+), 255 deletions(-) New commits: commit c923b15cd99672e5b93d1ab6314c66caa417c738 Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 28 13:31:35 2014 + Resolves: fdo#73851 promote labels to headings Change-Id: Ia12b32abfad987bfaecc54005a73ccbeb158f61b diff --git a/sw/uiconfig/swriter/ui/optredlinepage.ui b/sw/uiconfig/swriter/ui/optredlinepage.ui index 3cd59bf..c54bc5e 100644 --- a/sw/uiconfig/swriter/ui/optredlinepage.ui +++ b/sw/uiconfig/swriter/ui/optredlinepage.ui @@ -1,13 +1,15 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ !-- interface-requires LibreOffice 1.0 -- - object class=GtkBox id=OptRedLinePage + object class=GtkGrid id=OptRedLinePage property name=visibleTrue/property property name=can_focusFalse/property +property name=hexpandTrue/property +property name=vexpandTrue/property property name=border_width6/property -property name=orientationvertical/property -property name=spacing12/property +property name=row_spacing12/property child object class=GtkFrame id=frame1 property name=visibleTrue/property @@ -24,74 +26,79 @@ property name=top_padding6/property property name=left_padding12/property child - object class=GtkGrid id=grid1 + object class=GtkGrid id=grid3 property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property property name=row_spacing6/property property name=column_spacing12/property child - object class=GtkLabel id=label2 + object class=GtkLabel id=insert_label property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property -property name=label translatable=yesInsertions/property +property name=label translatable=yes_Attributes:/property +property name=use_underlineTrue/property +property name=mnemonic_widgetinsert/property /object packing property name=left_attach0/property property name=top_attach0/property -property name=width3/property -property name=height1/property - /packing -/child -child - object class=svtlo-ColorListBox id=insertcolor -property name=visibleTrue/property -property name=can_focusFalse/property -property name=valigncenter/property - /object - packing -property name=left_attach1/property -property name=top_attach2/property property name=width1/property property name=height1/property /packing /child child - object class=svtlo-ColorListBox id=deletedcolor + object class=GtkLabel id=insertcolor_label property name=visibleTrue/property property name=can_focusFalse/property -property name=valigncenter/property +property name=xalign0/property +property name=label translatable=yesCo_lor:/property +property name=use_underlineTrue/property +property name=mnemonic_widgetinsertcolor/property /object packing -property name=left_attach1/property -property name=top_attach5/property +property name=left_attach0/property +property name=top_attach1/property property name=width1/property property name=height1/property /packing /child child -
[Libreoffice-commits] core.git: svgio/source
svgio/source/svgreader/svgimagenode.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eaa876e48695e7927563ee56a08e11acb0036e4a
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Feb 28 17:55:56 2014 +0100
typo in comment
Change-Id: I78a47d807ed9228fd6bc8d3dbbf038881a8d383b
diff --git a/svgio/source/svgreader/svgimagenode.cxx
b/svgio/source/svgreader/svgimagenode.cxx
index 9cdb59a..39994a8 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -242,7 +242,7 @@ namespace svgio
aAbsUrl = rtl::Uri::convertRelToAbs(
rPath, maUrl);
} catch (rtl::MalformedUriException e) {
-// Happens for the odd maUrl =
+// Happens for the odd rPath =
// vnd.sun.star.Package:Pictures/... scheme
// using path components not starting with a
// slash by mis-design:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/qa
starmath/qa/cppunit/test_nodetotextvisitors.cxx | 16
1 file changed, 4 insertions(+), 12 deletions(-)
New commits:
commit a7a47272b962543dc5bbd3c2f42e889c4f58ef96
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Fri Feb 28 11:11:10 2014 +
TestOutputDevice can't set meOutDevType
One of the StarMath tests was very broken - the issue is in formula tester.
It
basically sets up its own derived TestOutputDevice. Because it doesn't set
meOutDevType (and can't as that's a private member function - I note this
whole
design is *broken* but I digress) a few things can't get access to a
SalGraphics instance. This is fixed by removing the class and changing it
to a
VirtualDevice - the test runs under headless mode anyway
Change-Id: I3d6eba793386e6db3f053aa4e6aab9a4d1c63fc3
Reviewed-on: https://gerrit.libreoffice.org/8395
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index 99ae4b2..62b37fc 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -21,14 +21,6 @@
SV_DECL_REF(SmDocShell)
SV_IMPL_REF(SmDocShell)
-class TestOutputDevice : public OutputDevice
-{
-public:
-TestOutputDevice()
-{
-}
-};
-
using namespace ::com::sun::star;
namespace {
@@ -510,7 +502,7 @@ void Test::testBinomInBinHor()
pTree-Prepare(xDocShRef-GetFormat(), *xDocShRef);
SmCursor aCursor(pTree, xDocShRef);
-TestOutputDevice aOutputDevice;
+VirtualDevice aOutputDevice;
// move forward (more than) enough places to be at the end
int i;
@@ -538,7 +530,7 @@ void Test::testBinVerInUnary()
pTree-Prepare(xDocShRef-GetFormat(), *xDocShRef);
SmCursor aCursor(pTree, xDocShRef);
-TestOutputDevice aOutputDevice;
+VirtualDevice aOutputDevice;
// move forward (more than) enough places to be at the end
int i;
@@ -567,7 +559,7 @@ void Test::testBinHorInSubSup()
pTree-Prepare(xDocShRef-GetFormat(), *xDocShRef);
SmCursor aCursor(pTree, xDocShRef);
-TestOutputDevice aOutputDevice;
+VirtualDevice aOutputDevice;
// Insert an RSup expression with a BinHor for the exponent
aCursor.InsertText(a);
@@ -595,7 +587,7 @@ void Test::testUnaryInMixedNumberAsNumerator()
pTree-Prepare(xDocShRef-GetFormat(), *xDocShRef);
SmCursor aCursor(pTree, xDocShRef);
-TestOutputDevice aOutputDevice;
+VirtualDevice aOutputDevice;
// move forward (more than) enough places to be at the end
for (size_t i = 0; i 3; ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source vcl/source
svx/source/svdraw/sdrpaintwindow.cxx | 97 ---
vcl/source/window/window.cxx |5 +
2 files changed, 84 insertions(+), 18 deletions(-)
New commits:
commit 1ec2880679d88c89901ce00fe30dd78e584f6960
Author: Caolán McNamara caol...@redhat.com
Date: Fri Feb 28 16:55:03 2014 +
Resolves: rhbz#1007697 Update on a Window triggering delete on window
Change-Id: Ic6374ce45e3a3ba97217ae77e91f9143f46e277b
Reviewed-on: https://gerrit.libreoffice.org/8396
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx
b/svx/source/svdraw/sdrpaintwindow.cxx
index b8b973d..76e75ac 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -23,34 +23,95 @@
#include vcl/gdimtf.hxx
#include vcl/svapp.hxx
#include vcl/settings.hxx
+#include set
+#include vector
+
+//rhbz#1007697 do this in two loops, one to collect the candidates
+//and another to update them because updating a candidate can
+//trigger the candidate to be deleted, so asking for its
+//sibling after that is going to fail hard
+class CandidateMgr
+{
+std::vectorWindow* m_aCandidates;
+std::setWindow* m_aDeletedCandidates;
+DECL_LINK(WindowEventListener, VclSimpleEvent*);
+public:
+void PaintTransparentChildren(Window rWindow, Rectangle const
rPixelRect);
+~CandidateMgr();
+};
+
+IMPL_LINK(CandidateMgr, WindowEventListener, VclSimpleEvent*, pEvent)
+{
+VclWindowEvent* pWinEvent = dynamic_cast VclWindowEvent* ( pEvent );
+if (pWinEvent)
+{
+Window* pWindow = pWinEvent-GetWindow();
+if (pWinEvent-GetId() == VCLEVENT_OBJECT_DYING)
+{
+m_aDeletedCandidates.insert(pWindow);
+}
+}
+
+return 0;
+}
+
+CandidateMgr::~CandidateMgr()
+{
+for (std::vectorWindow*::iterator aI = m_aCandidates.begin();
+ aI != m_aCandidates.end(); ++aI)
+{
+Window* pCandidate = *aI;
+if (m_aDeletedCandidates.find(pCandidate) !=
m_aDeletedCandidates.end())
+continue;
+pCandidate-RemoveEventListener(LINK(this, CandidateMgr,
WindowEventListener));
+}
+}
void PaintTransparentChildren(Window rWindow, Rectangle const rPixelRect)
{
-if (rWindow.IsChildTransparentModeEnabled())
+if (!rWindow.IsChildTransparentModeEnabled())
+return;
+
+CandidateMgr aManager;
+aManager.PaintTransparentChildren(rWindow, rPixelRect);
+}
+
+void CandidateMgr::PaintTransparentChildren(Window rWindow, Rectangle const
rPixelRect)
+{
+Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
+while (pCandidate)
{
-Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
-while (pCandidate)
+if (pCandidate-IsPaintTransparent())
{
-if (pCandidate-IsPaintTransparent())
+const Rectangle aCandidatePosSizePixel(
+pCandidate-GetPosPixel(),
+pCandidate-GetSizePixel());
+
+if (aCandidatePosSizePixel.IsOver(rPixelRect))
{
-const Rectangle aCandidatePosSizePixel(
-pCandidate-GetPosPixel(),
-pCandidate-GetSizePixel());
-
-if (aCandidatePosSizePixel.IsOver(rPixelRect))
-{
-pCandidate-Invalidate(
-INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
-// important: actually paint the child here!
-pCandidate-Update();
-}
+m_aCandidates.push_back(pCandidate);
+pCandidate-AddEventListener(LINK(this, CandidateMgr,
WindowEventListener));
}
-pCandidate = pCandidate-GetWindow( WINDOW_NEXT );
}
+pCandidate = pCandidate-GetWindow( WINDOW_NEXT );
}
-}
-
+for (std::vectorWindow*::iterator aI = m_aCandidates.begin();
+ aI != m_aCandidates.end(); ++aI)
+{
+pCandidate = *aI;
+if (m_aDeletedCandidates.find(pCandidate) !=
m_aDeletedCandidates.end())
+continue;
+//rhbz#1007697 this can cause the window itself to be
+//deleted. So we are listening to see if that happens
+//and if so, then skip the update
+pCandidate-Invalidate(INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN);
+// important: actually paint the child here!
+if (m_aDeletedCandidates.find(pCandidate) !=
m_aDeletedCandidates.end())
+continue;
+pCandidate-Update();
+}
+}
SdrPreRenderDevice::SdrPreRenderDevice(OutputDevice rOriginal)
: mrOutputDevice(rOriginal)
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 277531b..722da94 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -7483,6 +7483,8 @@ void
[Libreoffice-commits] core.git: vcl/generic vcl/headless vcl/inc vcl/osx vcl/quartz vcl/source vcl/unx vcl/win
vcl/generic/print/genprnpsp.cxx |2 +-
vcl/headless/svpframe.cxx|2 +-
vcl/headless/svpvd.cxx |2 +-
vcl/inc/generic/genprn.h |2 +-
vcl/inc/headless/svpframe.hxx|2 +-
vcl/inc/headless/svpvd.hxx |2 +-
vcl/inc/osx/salframe.h |2 +-
vcl/inc/osx/salprn.h |2 +-
vcl/inc/quartz/salvd.h |2 +-
vcl/inc/salframe.hxx |2 +-
vcl/inc/salprn.hxx |2 +-
vcl/inc/salvd.hxx|2 +-
vcl/inc/unx/gtk/gtkframe.hxx |2 +-
vcl/inc/unx/kde/kdedata.hxx |2 +-
vcl/inc/unx/salframe.h |2 +-
vcl/inc/unx/salvd.h |2 +-
vcl/inc/unx/tde/tdedata.hxx |2 +-
vcl/inc/win/salframe.h |2 +-
vcl/inc/win/salprn.h |2 +-
vcl/inc/win/salvd.h |2 +-
vcl/osx/salframe.cxx |4 ++--
vcl/osx/salprn.cxx |2 +-
vcl/quartz/salvd.cxx |2 +-
vcl/source/gdi/outdev.cxx| 16
vcl/source/gdi/virdev.cxx|2 +-
vcl/unx/generic/gdi/salvd.cxx|2 +-
vcl/unx/generic/window/salframe.cxx |2 +-
vcl/unx/gtk/window/gtksalframe.cxx |4 ++--
vcl/unx/kde/salnativewidgets-kde.cxx |2 +-
vcl/unx/kde4/KDESalFrame.cxx |2 +-
vcl/unx/kde4/KDESalFrame.hxx |2 +-
vcl/win/source/gdi/salprn.cxx|2 +-
vcl/win/source/gdi/salvd.cxx |2 +-
vcl/win/source/window/salframe.cxx |4 ++--
34 files changed, 44 insertions(+), 44 deletions(-)
New commits:
commit d12324d13620e5acda63b1b0c21731fecc49aa01
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sat Feb 15 19:51:04 2014 +1100
Rename GetGraphics to AcquireGraphics
Currently there are a number of classes that have a function called
GetGraphics(). It returns a SalGraphics instance if one is available
for the sole use of the caller. Some variants keep a pool of available
SalGraphics and return one not currently in use by anyone, creating
extra ones on demand, sometimes up to a set limit and returning NULL
on reaching that limit of simultaneously in use SalGraphics.
This is confusing. What is really happening from the perspective of the
calling
is that is that we are attempting to *acquire* ownership of a SalGraphics
instance.
Therefore, rename GetGraphics to AcquireGraphics() which returns a handle
to a
SalGraphics if we can acquire a free graphics instance, and NULL if we
cannot,
which makes it cleared that ReleaseGraphics should be called on the result
of AcquireGraphics.
The classes that were changed to include the new acquire function are:
* SalFrame
* SalVirtualDevice
* SalInfoPrinter
* PspSalInfoPrinter
* X11SalFrame
* X11SalVirtualDevice
* GtkSalFrame
* KDESalFrame
* TDESalFrame
* WinSalFrame
* WinSalInfoPrinter
* WinSalVirtualDevice
* SvpSalFrame
* SvpSalVirtualDevice
* AquaSalFrame
* AquaSalInfoPrinter
* AquaSalVirtualDevice
Change-Id: Ic39c08a4bcaf665ae08ba2808cd03b0e80790c46
Reviewed-on: https://gerrit.libreoffice.org/8070
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index f49af9a..de72bb9 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -534,7 +534,7 @@ int PspSalInfoPrinter::GetLandscapeAngle( const
ImplJobSetup* )
return 900;
}
-SalGraphics* PspSalInfoPrinter::GetGraphics()
+SalGraphics* PspSalInfoPrinter::AcquireGraphics()
{
// return a valid pointer only once
// the reasoning behind this is that we could have different
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index e4ab5a1..68aa4d0 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -167,7 +167,7 @@ void SvpSalFrame::LoseFocus()
}
}
-SalGraphics* SvpSalFrame::GetGraphics()
+SalGraphics* SvpSalFrame::AcquireGraphics()
{
SvpSalGraphics* pGraphics = new SvpSalGraphics();
pGraphics-setDevice( m_aFrame );
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index 6d5cfbc..0f3c197 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -33,7 +33,7 @@ SvpSalVirtualDevice::~SvpSalVirtualDevice()
{
}
-SalGraphics* SvpSalVirtualDevice::GetGraphics()
+SalGraphics* SvpSalVirtualDevice::AcquireGraphics()
{
SvpSalGraphics* pGraphics = new SvpSalGraphics();
pGraphics-setDevice( m_aDevice );
diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/generic/genprn.h
index a14a46a..d21b97e 100644
--- a/vcl/inc/generic/genprn.h
+++ b/vcl/inc/generic/genprn.h
@@ -38,7 +38,7 @@ public:
virtual
[Libreoffice-commits] core.git: svgio/source
svgio/source/svgreader/svgimagenode.cxx | 54
1 file changed, 21 insertions(+), 33 deletions(-)
New commits:
commit 33ca98314133a93e71edb1a003fe8ddb7b36e8a9
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Feb 28 18:03:04 2014 +0100
Catching MalformedUriException subsumes the rPath.isEmpty() case now
...so that is no longer necessary, and checking for rPath.isEmpty() first
also
mis-handled the case where rPath was empty but maUrl was already absolute.
Change-Id: Ieae800dd6c52f0cc308944ca0035ea4140d3a324
diff --git a/svgio/source/svgreader/svgimagenode.cxx
b/svgio/source/svgreader/svgimagenode.cxx
index 39994a8..e575502 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -234,45 +234,33 @@ namespace svgio
else if(!maUrl.isEmpty())
{
const OUString rPath =
getDocument().getAbsolutePath();
+OUString aAbsUrl;
+try {
+aAbsUrl = rtl::Uri::convertRelToAbs(rPath, maUrl);
+} catch (rtl::MalformedUriException e) {
+// Happens for the odd rPath =
+// vnd.sun.star.Package:Pictures/... scheme using
+// path components not starting with a slash by
mis-
+// design:
+SAL_INFO(
+svg,
+caught rtl::MalformedUriException \
+ e.getMessage() \);
+}
-if (!rPath.isEmpty())
+if (!aAbsUrl.isEmpty())
{
-OUString aAbsUrl;
-try {
-aAbsUrl = rtl::Uri::convertRelToAbs(
-rPath, maUrl);
-} catch (rtl::MalformedUriException e) {
-// Happens for the odd rPath =
-// vnd.sun.star.Package:Pictures/... scheme
-// using path components not starting with a
-// slash by mis-design:
-SAL_INFO(
-svg,
-caught rtl::MalformedUriException \
- e.getMessage() \);
-}
+SvFileStream aStream(aAbsUrl, STREAM_STD_READ);
+Graphic aGraphic;
-if (!aAbsUrl.isEmpty())
+if(GRFILTER_OK ==
GraphicFilter::GetGraphicFilter().ImportGraphic(
+ aGraphic,
+ aAbsUrl,
+ aStream))
{
-SvFileStream aStream(aAbsUrl, STREAM_STD_READ);
-Graphic aGraphic;
-
-if(GRFILTER_OK ==
GraphicFilter::GetGraphicFilter().ImportGraphic(
-aGraphic,
-aAbsUrl,
-aStream))
-{
-extractFromGraphic(aGraphic, aNewTarget,
aViewBox, aBitmapEx);
-}
+extractFromGraphic(aGraphic, aNewTarget,
aViewBox, aBitmapEx);
}
}
-else
-{
-// #i123042# detect missing path and assert -
content will be missing. The
-// absolute path to itself needs to be set to
correctly import linked
-// content in a SVG file
-OSL_ENSURE(false, SVG graphic with internal links
is interpreted, but local AbsolutePath is not set: linked content will be
missing (!));
-}
}
else if(!maXLink.isEmpty())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4-2-milestone-6'
Tag 'libreoffice-4-2-milestone-6' created by Jan Holesovsky ke...@collabora.com at 2014-02-28 19:15 -0800 milestone six Changes since libreoffice-4-2-milestone-5-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 7 commits - oox/source sw/qa sw/source writerfilter/inc writerfilter/source
oox/source/token/tokens.txt|1
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 38
sw/source/filter/ww8/docxexport.cxx| 48 +
sw/source/filter/ww8/docxexport.hxx|4 -
writerfilter/inc/dmapper/DomainMapper.hxx |1
writerfilter/source/dmapper/DomainMapper.cxx |5 ++
writerfilter/source/dmapper/SettingsTable.cxx | 39 -
writerfilter/source/dmapper/SettingsTable.hxx |2
writerfilter/source/dmapper/TextEffectsHandler.cxx |8 +++
writerfilter/source/filter/ImportFilter.cxx|6 ++
writerfilter/source/ooxml/model.xml| 36 +++
11 files changed, 174 insertions(+), 14 deletions(-)
New commits:
commit 79341203763b5cbcd8fee675588a0788b06af2fd
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Fri Feb 28 14:25:27 2014 +0100
ooxml: rountrip test for w:compatSettings and mc:Ignorable
Change-Id: I69a602f3a5eb83f116113b1dbe8bb9f208bd5e5d
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 69311ca..06b6fa5 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2881,6 +2881,44 @@
DECLARE_OOXMLEXPORT_TEST(testW14TextEffects_StylisticSets_CntxtAlts, TextEffect
}
+DECLARE_OOXMLEXPORT_TEST(testMcIgnorable,
TextEffects_StylisticSets_CntxtAlts.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+if (!pXmlDoc)
+return;
+
+ assertXPath(pXmlDoc, /w:document, Ignorable, w14 wp14);
+}
+
+DECLARE_OOXMLEXPORT_TEST(testCompatSettingsForW14,
TextEffects_StylisticSets_CntxtAlts.docx)
+{
+xmlDocPtr pXmlDoc = parseExport(word/settings.xml);
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting, 5);
+
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[1], name,
compatibilityMode);
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[1], uri,
http://schemas.microsoft.com/office/word;);
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[1], val,
15); // document was made with Word2013 - 15
+
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[2], name,
overrideTableStyleFontSizeAndJustification);
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[2], uri,
http://schemas.microsoft.com/office/word;);
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[2], val,
1);
+
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[3], name,
enableOpenTypeFeatures);
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[3], uri,
http://schemas.microsoft.com/office/word;);
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[3], val,
1);
+
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[4], name,
doNotFlipMirrorIndents);
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[4], uri,
http://schemas.microsoft.com/office/word;);
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[4], val,
1);
+
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[5], name,
differentiateMultirowTableHeaders);
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[5], uri,
http://schemas.microsoft.com/office/word;);
+assertXPath(pXmlDoc, /w:settings/w:compat/w:compatSetting[5], val,
1);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
commit a783421ef0ecb53b7f4240f5a5e4116d3e9963b3
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Fri Feb 28 14:23:32 2014 +0100
ooxml export: write w:compatSettings if present in GrabBag
Change-Id: Ie5f3ba8f12ca8d5b9729c5bfa13da3b34dbfda2d
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index aff296f..b68368c 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -869,7 +869,38 @@ void DocxExport::WriteSettings()
FSNS( XML_w, XML_eastAsia ),
OUStringToOString( aValues[1], RTL_TEXTENCODING_UTF8 ).getStr(),
FSNS( XML_w, XML_bidi ),
OUStringToOString( aValues[2], RTL_TEXTENCODING_UTF8 ).getStr(),
FSEND );
-break;
+}
+else if ( propList[i].Name == CompatSettings )
+{
+pFS-startElementNS( XML_w, XML_compat, FSEND );
+
+uno::Sequence beans::PropertyValue aCompatSettingsSequence;
+propList[i].Value = aCompatSettingsSequence;
+for(sal_Int32 j=0; j aCompatSettingsSequence.getLength();
++j)
+{
+uno::Sequence beans::PropertyValue aCompatSetting;
+aCompatSettingsSequence[j].Value = aCompatSetting;
+OUString aName;
+OUString aUri;
+
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unochart.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f9e365d138732d8cdc29dc08efaf1e86b88ecd6c Author: Takeshi Abe t...@fixedpoint.jp Date: Fri Feb 28 22:52:59 2014 +0900 Avoid a resource leak It seems an aged mistake to pass pUnoCrsr to a std::auto_ptr too early Change-Id: I99ab2d8c8719fb9f0fc3e90f36534007b4cde990 Reviewed-on: https://gerrit.libreoffice.org/8393 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 5bd2558..c144ae4 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include memory #include algorithm #include com/sun/star/chart/ChartDataRowSource.hpp @@ -46,6 +45,7 @@ #include docary.hxx #include comphelper/servicehelper.hxx #include comphelper/string.hxx +#include boost/scoped_ptr.hpp using namespace ::com::sun::star; @@ -684,9 +684,9 @@ uno::Reference chart2::data::XDataSource SwChartDataProvider::Impl_createData // get table format for that single table from above SwFrmFmt*pTblFmt = 0; // pointer to table format SwUnoCrsr *pUnoCrsr = 0; // here required to check if the cells in the range do actually exist -std::auto_ptr SwUnoCrsr pAuto( pUnoCrsr ); // to end lifetime of object pointed to by pUnoCrsr if (aSubRanges.getLength() 0) GetFormatAndCreateCursorFromRangeRep( pDoc, pSubRanges[0], pTblFmt, pUnoCrsr ); +boost::scoped_ptr SwUnoCrsr pAuto( pUnoCrsr ); // to end lifetime of object pointed to by pUnoCrsr if (!pTblFmt || !pUnoCrsr) throw lang::IllegalArgumentException(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ascii/wrtasc.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 754dd9212aca0d30f8e50cf67b52c0a8dab814c9 Author: Douglas Mencken dougmenc...@gmail.com Date: Fri Feb 28 12:55:17 2014 -0500 sw: hey, don't forget about big-endian parts in wrtasc.cxx! Change-Id: I8e71c35dfb4f8ce475357412cc9121c50830069e Reviewed-on: https://gerrit.libreoffice.org/8401 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx index 8b89a9a..1ade412 100644 --- a/sw/source/filter/ascii/wrtasc.cxx +++ b/sw/source/filter/ascii/wrtasc.cxx @@ -161,7 +161,7 @@ sal_uLong SwASCWriter::WriteStream() #ifdef OSL_LITENDIAN Strm().WriteUChar( sal_uInt8(0xFF) ).WriteUChar( sal_uInt8(0xFE) ); #else -Strm() sal_uInt8(0xFE) sal_uInt8(0xFF); +Strm().WriteUChar( sal_uInt8(0xFE) ).WriteUChar( sal_uInt8(0xFF) ); #endif break; ___ 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' - svgio/source
svgio/source/svgreader/svgimagenode.cxx | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit f1e3e9e514aa90ff4d8234801d86b317b6bc5d24
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Feb 28 17:43:23 2014 +0100
fdo#75582: Handle MalformedUriException
Cherry-picks from master 29c3bb0968cb9770f7b822f5cf466314be9db825 Handle
vnd.sun.star.Package: URLs provoking MalrformedUriException,
eaa876e48695e7927563ee56a08e11acb0036e4a typo in comment, and
33ca98314133a93e71edb1a003fe8ddb7b36e8a9 Catching MalformedUriException
subsumes the rPath.isEmpty() case now, which are based on master-only
87432aeecdfa7194bb5050f912656e03294cf6c7 Resolves: #i123042# corrected
reload
of linked content... but which is not needed to fix this issue.
Conflicts:
svgio/source/svgreader/svgimagenode.cxx
Change-Id: I68ea3410be2f758c869ef284718ccf139f1c9b78
Reviewed-on: https://gerrit.libreoffice.org/8399
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/svgio/source/svgreader/svgimagenode.cxx
b/svgio/source/svgreader/svgimagenode.cxx
index 30300e0..8542b65 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -235,7 +235,19 @@ namespace svgio
else if(!maUrl.isEmpty())
{
const OUString rPath =
getDocument().getAbsolutePath();
-const OUString
aAbsUrl(rtl::Uri::convertRelToAbs(rPath, maUrl));
+OUString aAbsUrl;
+try {
+aAbsUrl = rtl::Uri::convertRelToAbs(rPath, maUrl);
+} catch (rtl::MalformedUriException e) {
+// Happens for the odd rPath =
+// vnd.sun.star.Package:Pictures/... scheme using
+// path components not starting with a slash by
mis-
+// design:
+SAL_INFO(
+svg,
+caught rtl::MalformedUriException \
+ e.getMessage() \);
+}
if(!aAbsUrl.isEmpty())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/bitmap3.cxx | 490 ++---
1 file changed, 245 insertions(+), 245 deletions(-)
New commits:
commit 1994ab92c8ca0d068b73017e641807fc7782e8da
Author: Mihai Varga mihai.m...@gmail.com
Date: Thu Feb 27 23:23:36 2014 +0200
[bug 75240] - removed unnecessary white spaces
Change-Id: I369ec4b2535b83673341ce389064d5a9c2050a48
Reviewed-on: https://gerrit.libreoffice.org/8388
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 22afc65..df7f2f1 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -36,13 +36,13 @@
#define MAP( cVal0, cVal1, nFrac )
((sal_uInt8)long)(cVal0)7L)+nFrac*((long)(cVal1)-(cVal0)))7L))
#define CALC_ERRORS
\
-nTemp = p1T[nX++] 12;
\
+nTemp = p1T[nX++] 12; \
nBErr = MinMax( nTemp, 0, 255 );
\
nBErr = nBErr - FloydIndexMap[ nBC = FloydMap[nBErr]
]; \
-nTemp = p1T[nX++] 12;
\
+nTemp = p1T[nX++] 12; \
nGErr = MinMax( nTemp, 0, 255 );
\
nGErr = nGErr - FloydIndexMap[ nGC = FloydMap[nGErr]
]; \
-nTemp = p1T[nX] 12;
\
+nTemp = p1T[nX] 12;\
nRErr = MinMax( nTemp, 0, 255 );
\
nRErr = nRErr - FloydIndexMap[ nRC = FloydMap[nRErr] ];
@@ -212,11 +212,11 @@ const long FloydIndexMap[6] =
void ImplCreateDitherMatrix( sal_uInt8 (*pDitherMatrix)[16][16] )
{
-double fVal = 3.125;
-const doublefVal16 = fVal / 16.;
-longi, j, k, l;
-sal_uInt16 pMtx[ 16 ][ 16 ];
-sal_uInt16 nMax = 0;
+double fVal = 3.125;
+const double fVal16 = fVal / 16.;
+long i, j, k, l;
+sal_uInt16 pMtx[ 16 ][ 16 ];
+sal_uInt16 nMax = 0;
static const sal_uInt8 pMagic[4][4] = { { 0, 14, 3, 13, },
{11, 5, 8, 6, },
{12, 2, 15, 1, },
@@ -238,8 +238,8 @@ void ImplCreateDitherMatrix( sal_uInt8
(*pDitherMatrix)[16][16] )
bool Bitmap::Convert( BmpConversion eConversion )
{
-const sal_uInt16nBitCount = GetBitCount();
-boolbRet = false;
+const sal_uInt16 nBitCount = GetBitCount ();
+bool bRet = false;
switch( eConversion )
{
@@ -326,20 +326,20 @@ bool Bitmap::Convert( BmpConversion eConversion )
bool Bitmap::ImplMakeMono( sal_uInt8 cThreshold )
{
-BitmapReadAccess* pReadAcc = AcquireReadAccess();
-boolbRet = false;
+BitmapReadAccess* pReadAcc = AcquireReadAccess();
+bool bRet = false;
if( pReadAcc )
{
-Bitmap aNewBmp( GetSizePixel(), 1 );
-BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess();
+Bitmap aNewBmp( GetSizePixel(), 1 );
+BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess();
if( pWriteAcc )
{
-const BitmapColor aBlack( pWriteAcc-GetBestMatchingColor(
Color( COL_BLACK ) ) );
-const BitmapColor aWhite( pWriteAcc-GetBestMatchingColor(
Color( COL_WHITE ) ) );
-const long nWidth = pWriteAcc-Width();
-const long nHeight = pWriteAcc-Height();
+const BitmapColor aBlack( pWriteAcc-GetBestMatchingColor( Color(
COL_BLACK ) ) );
+const BitmapColor aWhite( pWriteAcc-GetBestMatchingColor( Color(
COL_WHITE ) ) );
+const long nWidth = pWriteAcc-Width();
+const long nHeight = pWriteAcc-Height();
if( pReadAcc-HasPalette() )
{
@@ -383,8 +383,8 @@ bool Bitmap::ImplMakeMono( sal_uInt8 cThreshold )
if( bRet )
{
-const MapMode aMap( maPrefMapMode );
-const Size aSize( maPrefSize );
+const MapMode aMap( maPrefMapMode );
+const Size aSize( maPrefSize );
*this = aNewBmp;
@@ -398,21 +398,21 @@ bool Bitmap::ImplMakeMono( sal_uInt8 cThreshold )
bool Bitmap::ImplMakeMonoDither()
{
-BitmapReadAccess* pReadAcc = AcquireReadAccess();
-boolbRet = false;
+BitmapReadAccess* pReadAcc = AcquireReadAccess();
+bool bRet = false;
if( pReadAcc )
{
-Bitmap aNewBmp( GetSizePixel(), 1 );
-BitmapWriteAccess* pWriteAcc = aNewBmp.AcquireWriteAccess();
+Bitmap aNewBmp(
[Libreoffice-commits] core.git: dbaccess/source editeng/source filter/source framework/inc framework/source include/formula lotuswordpro/source reportdesign/inc rsc/inc rsc/source uui/source
dbaccess/source/ui/inc/propertystorage.hxx |3 ---
editeng/source/accessibility/AccessibleHyperlink.hxx |2 --
filter/source/graphicfilter/icgm/cgm.hxx |1 -
framework/inc/pch/precompiled_fwk.hxx|1 -
framework/inc/uielement/commandinfo.hxx |2 --
framework/source/uielement/menubarwrapper.cxx|3 ---
include/formula/opcode.hxx |2 +-
lotuswordpro/source/filter/lwpheader.hxx |5 ++---
reportdesign/inc/RptDef.hxx |2 --
rsc/inc/rscerror.h |8 +---
rsc/inc/rscpar.hxx |5 ++---
rsc/inc/rsctools.hxx | 19 +--
rsc/source/res/rsctop.cxx|4 +---
uui/source/iahndl.hxx|7 +--
14 files changed, 21 insertions(+), 43 deletions(-)
New commits:
commit e218663251425f5dd6d56c7273b9e1e93748981f
Author: Alexandre Vicenzi vicenzi.alexan...@gmail.com
Date: Tue Feb 18 22:53:08 2014 -0300
fdo#63154 Remove unused solar.h
Removed from dbaccess. editeng, filter,
framwork, formula, lotuswordpro, reportdesing, rsc,
uui
Conflicts:
framework/source/uielement/menubarwrapper.cxx
reportdesign/inc/RptDef.hxx
uui/source/iahndl.hxx
Change-Id: Ia6f1d8679736c3de99bd8060d8a7f76975268273
Reviewed-on: https://gerrit.libreoffice.org/8118
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/dbaccess/source/ui/inc/propertystorage.hxx
b/dbaccess/source/ui/inc/propertystorage.hxx
index f9b33e8..75cdbab 100644
--- a/dbaccess/source/ui/inc/propertystorage.hxx
+++ b/dbaccess/source/ui/inc/propertystorage.hxx
@@ -21,9 +21,6 @@
#define INCLUDED_DBACCESS_SOURCE_UI_INC_PROPERTYSTORAGE_HXX
#include com/sun/star/uno/Any.hxx
-
-#include tools/solar.h
-
#include boost/shared_ptr.hpp
#include map
diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx
b/editeng/source/accessibility/AccessibleHyperlink.hxx
index 6871432..28bdc2f 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.hxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.hxx
@@ -29,8 +29,6 @@
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/accessibility/XAccessibleHyperlink.hpp
-#include tools/solar.h
-
class SvxFieldItem;
class SvxAccessibleTextAdapter;
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx
b/filter/source/graphicfilter/icgm/cgm.hxx
index 7cc8fc0..d81ade2 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -28,7 +28,6 @@
#define CGM_EXPORT_IMPRESS 0x0100
#define CGM_EXPORT_META 0x0200
-#include tools/solar.h
#include rtl/ustring.hxx
#include vector
#include cgmtypes.hxx
diff --git a/framework/inc/pch/precompiled_fwk.hxx
b/framework/inc/pch/precompiled_fwk.hxx
index ed9ceea..ae4b767 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -322,7 +322,6 @@
#include tools/gen.hxx
#include tools/rcid.h
#include tools/resmgr.hxx
-#include tools/solar.h
#include tools/stream.hxx
#include tools/urlobj.hxx
#include tools/wintypes.hxx
diff --git a/framework/inc/uielement/commandinfo.hxx
b/framework/inc/uielement/commandinfo.hxx
index 8b7d6f7..358565c 100644
--- a/framework/inc/uielement/commandinfo.hxx
+++ b/framework/inc/uielement/commandinfo.hxx
@@ -23,8 +23,6 @@
#include macros/generic.hxx
#include stdtypes.h
-#include tools/solar.h
-
namespace framework
{
diff --git a/framework/source/uielement/menubarwrapper.cxx
b/framework/source/uielement/menubarwrapper.cxx
index f7ef370..8153825 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -33,7 +33,6 @@
#include com/sun/star/util/URLTransformer.hpp
#include comphelper/processfactory.hxx
-#include tools/solar.h
#include vcl/svapp.hxx
using namespace com::sun::star;
@@ -49,9 +48,7 @@ using namespace ::com::sun::star::ui;
namespace framework
{
-
// XInterface, XTypeProvider
-
DEFINE_XINTERFACE_11( MenuBarWrapper
,
UIConfigElementWrapperBase
,
DIRECT_INTERFACE(
::com::sun::star::lang::XTypeProvider ),
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 168fa75..c754dc7 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_FORMULA_OPCODE_HXX
#include formula/compiler.hrc
-#include tools/solar.h
+#include sal/types.h
enum OpCodeEnum
{
diff --git a/lotuswordpro/source/filter/lwpheader.hxx
b/lotuswordpro/source/filter/lwpheader.hxx
index 27da926..711f9a9 100644
[Bug 63154] replace tools/solar.h macros with osl versions
https://bugs.freedesktop.org/show_bug.cgi?id=63154 --- Comment #66 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Alexandre Vicenzi committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=e218663251425f5dd6d56c7273b9e1e93748981f fdo#63154 Remove unused solar.h 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
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/SettingsTable.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit f821b00c6d2b362974c4a78d3bc8d57839289121
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Feb 28 22:01:01 2014 +0100
Cosmetics.
Change-Id: I71c7b711f583079de7d5c075616d7d437fa992db
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx
b/writerfilter/source/dmapper/SettingsTable.cxx
index 27ff52d..a423b67 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -263,14 +263,14 @@ void SettingsTable::lcl_sprm(Sprm rSprm)
case NS_ooxml::LN_CT_Compat_compatSetting:
{
writerfilter::ReferenceProperties::Pointer_t pProperties =
rSprm.getProps();
-if( pProperties.get())
+if (pProperties.get())
{
pProperties-resolve(*this);
-sal_Int32 aLength = m_pImpl-m_pCompatSettings.getLength();
-m_pImpl-m_pCompatSettings.realloc(aLength + 1);
-m_pImpl-m_pCompatSettings[aLength].Name = compatSetting;
-m_pImpl-m_pCompatSettings[aLength].Value =
uno::makeAny(m_pImpl-m_pCurrentCompatSetting);
+sal_Int32 nLength = m_pImpl-m_pCompatSettings.getLength();
+m_pImpl-m_pCompatSettings.realloc(nLength + 1);
+m_pImpl-m_pCompatSettings[nLength].Name = compatSetting;
+m_pImpl-m_pCompatSettings[nLength].Value =
uno::makeAny(m_pImpl-m_pCurrentCompatSetting);
}
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sd/source
sd/source/ui/view/drviews5.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit 2f6673f38d76df1a26c658b20e9c180c7bfd4d14
Author: Armin Le Grand a...@apache.org
Date: Fri Feb 28 20:27:32 2014 +
i57936 Added refresh to update LayerTabBar when attributes like Layer
visibility were set
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index cd99218..fc9fb0f 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -320,6 +320,17 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView)
EditMode eNewEditMode = pView-GetViewShEditMode(mePageKind);
sal_Bool bNewLayerMode = pView-IsLayerMode();
+
+if(IsLayerModeActive() bNewLayerMode)
+{
+// #57936# Force mbIsLayerModeActive to false so that ChangeEditMode
+// below does something regarding LayerTabBar content refresh. That
refresh
+// is only done when IsLayerModeActive changes. It needs to be done
+// since e.g. Layer vsisibility was changed above and this may need
+// a refresh to show the correct graphical representation
+mbIsLayerModeActive = false;
+}
+
ChangeEditMode(eNewEditMode, bNewLayerMode);
SwitchPage(nSelectedPage);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/qa sc/source
sc/inc/formulacell.hxx | 22 ---
sc/qa/unit/ucalc.hxx|2
sc/qa/unit/ucalc_sharedformula.cxx | 90 +
sc/source/core/data/column.cxx | 109 ++--
sc/source/core/data/formulacell.cxx |6 +
sc/source/core/tool/compiler.cxx|4 -
sc/source/core/tool/token.cxx | 31 ++
7 files changed, 236 insertions(+), 28 deletions(-)
New commits:
commit f32df2d590d0ee14f09664934457ba9e8de8cbe6
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Feb 28 21:25:01 2014 -0500
fdo#75053: Adjust reference update on shift for formula groups.
This is similar to my earlier fix for reference update on moving of
cells.
Change-Id: I592599507bfcab12f611eeae7b56c99da6c31919
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 42e00a9..f75895b 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -132,14 +132,6 @@ private:
};
voidInterpretTail( ScInterpretTailParameter );
-bool UpdatePosOnShift( const sc::RefUpdateContext rCxt );
-
-/**
- * Update reference in response to cell insertion or deletion.
- */
-bool UpdateReferenceOnShift(
-const sc::RefUpdateContext rCxt, ScDocument* pUndoDoc, const
ScAddress* pUndoCellPos );
-
/**
* Update reference in response to cell copy-n-paste.
*/
@@ -213,6 +205,7 @@ public:
void ResetDirty();
bool NeedsListening() const;
void SetNeedsListening( bool bVar );
+void SetNeedsDirty( bool bVar );
void SetNeedNumberFormat( bool bVal );
short GetFormatType() const;
voidCompile(const OUString rFormula,
@@ -246,6 +239,19 @@ public:
const sc::RefUpdateContext rCxt, ScDocument* pUndoDoc = NULL, const
ScAddress* pUndoCellPos = NULL );
/**
+ * Shift the position of formula cell as part of reference update.
+ *
+ * @return true if the position has shifted, false otherwise.
+ */
+bool UpdatePosOnShift( const sc::RefUpdateContext rCxt );
+
+/**
+ * Update reference in response to cell insertion or deletion.
+ */
+bool UpdateReferenceOnShift(
+const sc::RefUpdateContext rCxt, ScDocument* pUndoDoc, const
ScAddress* pUndoCellPos );
+
+/**
* Update reference in response to cell move.
*/
bool UpdateReferenceOnMove(
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 4b8d38c..b7fd479 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2428,6 +2428,68 @@ class UpdateRefOnNonCopy :
std::unary_functionFormulaGroup, void
ScDocument* mpUndoDoc;
bool mbUpdated;
+void updateRefOnShift( FormulaGroup rGroup )
+{
+if (!rGroup.mbShared)
+{
+ScAddress aUndoPos(mnCol, rGroup.mnRow, mnTab);
+mbUpdated |= rGroup.mpCell-UpdateReferenceOnShift(*mpCxt,
mpUndoDoc, aUndoPos);
+return;
+}
+
+// Update references of a formula group.
+ScFormulaCell** pp = rGroup.mpCells;
+ScFormulaCell** ppEnd = pp + rGroup.mnLength;
+ScFormulaCell* pTop = *pp;
+ScTokenArray* pCode = pTop-GetCode();
+boost::scoped_ptrScTokenArray pOldCode(pCode-Clone());
+ScAddress aOldPos = pTop-aPos;
+
+// Run this before the position gets updated.
+sc::RefUpdateResult aRes = pCode-AdjustReferenceOnShift(*mpCxt,
aOldPos);
+
+if (pTop-UpdatePosOnShift(*mpCxt))
+{
+// Update the positions of all formula cells.
+for (++pp; pp != ppEnd; ++pp) // skip the top cell.
+{
+ScFormulaCell* pFC = *pp;
+pFC-aPos.Move(mpCxt-mnColDelta, mpCxt-mnRowDelta,
mpCxt-mnTabDelta);
+}
+
+if (pCode-IsRecalcModeOnRefMove())
+aRes.mbValueChanged = true;
+}
+
+if (aRes.mbReferenceModified)
+{
+sc::StartListeningContext aStartCxt(mpCxt-mrDoc);
+sc::EndListeningContext aEndCxt(mpCxt-mrDoc, pOldCode.get());
+aEndCxt.setPositionDelta(
+ScAddress(-mpCxt-mnColDelta, -mpCxt-mnRowDelta,
-mpCxt-mnTabDelta));
+
+for (pp = rGroup.mpCells; pp != ppEnd; ++pp)
+{
+ScFormulaCell* p = *pp;
+p-EndListeningTo(aEndCxt);
+p-SetNeedsListening(true);
+}
+
+mbUpdated = true;
+
+fillUndoDoc(aOldPos, rGroup.mnLength, *pOldCode);
+}
+
+if (aRes.mbValueChanged)
+{
+for (pp = rGroup.mpCells; pp != ppEnd; ++pp)
+{
+ScFormulaCell* p = *pp;
+p-SetNeedsDirty(true);
+}
+}
+}
+
void updateRefOnMove( FormulaGroup rGroup )
{
if (!rGroup.mbShared)
@@ -2484,21 +2546,26 @@ class UpdateRefOnNonCopy
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/uiconfig sw/uiconfig
cui/uiconfig/ui/connpooloptions.ui | 92 --- sw/uiconfig/swriter/ui/optredlinepage.ui | 392 +++ 2 files changed, 255 insertions(+), 229 deletions(-) New commits: commit 90aad4ad6aa814710ce7553cb196392da949e9a8 Author: Caolán McNamara caol...@redhat.com Date: Fri Feb 28 13:31:35 2014 + Resolves: fdo#73851 promote labels to headings Change-Id: Ia12b32abfad987bfaecc54005a73ccbeb158f61b (cherry picked from commit c923b15cd99672e5b93d1ab6314c66caa417c738) Related: fdo#73851 select driver list widget to shrink/expand Change-Id: I3f2013ab8e0b188e74da99d2f1ff8bc842f60f50 (cherry picked from commit c8cd1c61ee3f491e170086f740ffde65a8a63f83) Reviewed-on: https://gerrit.libreoffice.org/8397 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Tested-by: Kohei Yoshida libreoff...@kohei.us diff --git a/cui/uiconfig/ui/connpooloptions.ui b/cui/uiconfig/ui/connpooloptions.ui index 811e49d..8571a5b 100644 --- a/cui/uiconfig/ui/connpooloptions.ui +++ b/cui/uiconfig/ui/connpooloptions.ui @@ -1,18 +1,13 @@ ?xml version=1.0 encoding=UTF-8? -!-- Generated with glade 3.16.0 on Thu Jan 9 14:52:53 2014 -- +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ !-- interface-requires LibreOffice 1.0 -- - object class=GtkAdjustment id=adjustment1 -property name=lower30/property -property name=upper600/property -property name=value60/property -property name=step_increment1/property -property name=page_increment10/property - /object object class=GtkGrid id=ConnPoolPage property name=visibleTrue/property property name=can_focusFalse/property +property name=hexpandTrue/property +property name=vexpandTrue/property property name=border_width6/property property name=row_spacing12/property child @@ -20,6 +15,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=hexpandTrue/property +property name=vexpandTrue/property property name=label_xalign0/property property name=shadow_typenone/property child @@ -28,14 +24,16 @@ property name=can_focusFalse/property property name=margin_top6/property property name=hexpandTrue/property +property name=vexpandTrue/property property name=top_padding6/property property name=left_padding12/property child - object class=GtkBox id=box1 + object class=GtkGrid id=grid1 property name=visibleTrue/property property name=can_focusFalse/property -property name=orientationvertical/property -property name=spacing12/property +property name=hexpandTrue/property +property name=vexpandTrue/property +property name=row_spacing6/property child object class=GtkCheckButton id=connectionpooling property name=label translatable=yesConnection pooling enabled/property @@ -48,41 +46,48 @@ property name=draw_indicatorTrue/property /object packing -property name=expandFalse/property -property name=fillTrue/property -property name=position0/property +property name=left_attach0/property +property name=top_attach0/property +property name=width1/property +property name=height1/property /packing /child child - object class=GtkBox id=box2 + object class=GtkGrid id=grid2 property name=visibleTrue/property property name=can_focusFalse/property property name=margin_left12/property -property name=orientationvertical/property -property name=spacing12/property +property name=hexpandTrue/property +property name=vexpandTrue/property +property name=row_spacing6/property child object class=GtkLabel id=driverslabel property name=visibleTrue/property property name=can_focusFalse/property property name=xalign0/property property name=label translatable=yesDrivers known in %PRODUCTNAME/property +property name=use_underlineTrue/property +property name=mnemonic_widgetdriverlist/property +property name=ellipsizestart/property /object packing -
LibreOffice Gerrit News for core on 2014-03-01
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + libcmis (bundled): add patch with missing definition for HTML_PARSE_RECOV in https://gerrit.libreoffice.org/8387 from Douglas Mencken about module external + curl (bundled): with-darwinssl option is not compatible with OSX SDK 10.5 in https://gerrit.libreoffice.org/8386 from Douglas Mencken about module external + FDO#75205 : Charts - Up Down bars are getting added to Line Chart. in https://gerrit.libreoffice.org/8360 from Umesh Kadam about module chart2, include, offapi, oox, xmloff + fdo#75158 : Handled unsupported fields for docx file. in https://gerrit.libreoffice.org/8391 from Sushil Shinde about module odk, offapi, sw, writerfilter + Refactored swooxmlexport tests cases. Added function to check contents. in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar about module sw + fdo#73596 Added support to import and export \r,\h Index flags. in https://gerrit.libreoffice.org/8099 from Nikhil Walvekar about module sw, writerfilter End of freshness + Merge HTML detection to text detection service in https://gerrit.libreoffice.org/8213 from Maxim Monastirsky about module build, filter, postprocess, solenv + fdo#75538 R^2 calculation for trendline similar to LINEST function in https://gerrit.libreoffice.org/8402 from Laurent BP about module chart2 + fdo#72468 Remove memory overflow on static memory. in https://gerrit.libreoffice.org/7087 from Arnaud Versini about module sal + Add CoinMP external as an alternative to lpsolve. in https://gerrit.libreoffice.org/8383 from Matúš Kukan about module build, external + fdo#60698: Split out slideshow code from animations in https://gerrit.libreoffice.org/8389 from Marcos Paulo de Souza about module animations, include, slideshow * Merged changes on master for project core changed in the last 25 hours: + fdo#63154 Remove unused solar.h in https://gerrit.libreoffice.org/8118 from Alexandre Vicenzi + [bug 75240] - removed unnecessary white spaces in https://gerrit.libreoffice.org/8388 from Mihai Varga + sw: hey, don't forget about big-endian parts in wrtasc.cxx! in https://gerrit.libreoffice.org/8401 from Douglas Mencken + Avoid a resource leak in https://gerrit.libreoffice.org/8393 from Takeshi Abe + Rename GetGraphics to AcquireGraphics in https://gerrit.libreoffice.org/8070 from Chris Sherlock + Resolves: rhbz#1007697 Update on a Window triggering delete on window in https://gerrit.libreoffice.org/8396 from Caolán McNamara + TestOutputDevice can't set meOutDevType in https://gerrit.libreoffice.org/8395 from Caolán McNamara + Use FSResolveAliasFile at least on OS X 10.6 in https://gerrit.libreoffice.org/8394 from Douglas Mencken + sal_Bool - bool in mostly vcl module in https://gerrit.libreoffice.org/8219 from Chris Sherlock * Abandoned changes on master for project core changed in the last 25 hours: + Change EnableOutput(bool) to (Enable|Disable)Output() in https://gerrit.libreoffice.org/7981 from Chris Sherlock + Added ImplSetGraphics function. in https://gerrit.libreoffice.org/8025 from Chris Sherlock + fdo#74424 Use GetClipRegion() in ImplInitClipRegion() in https://gerrit.libreoffice.org/7980 from Chris Sherlock + Add default parameter to OutputDevice::GetClipRegion in https://gerrit.libreoffice.org/7965 from Chris Sherlock + Rename GetGraphics to AcquireGraphics in https://gerrit.libreoffice.org/8392 from Caolán McNamara + Clipping functions grouped together in https://gerrit.libreoffice.org/7964 from Chris Sherlock + Changes to IsClipRegion and ImplIsAntiparallel in https://gerrit.libreoffice.org/7949 from Chris Sherlock + fdo#74424 Move ReMirror into wrapper functions in https://gerrit.libreoffice.org/7943 from Chris Sherlock + fdo#60698: Merge animcore into sd and slideshow in https://gerrit.libreoffice.org/7108 from Marcos Paulo de Souza * Open changes needing tweaks, but being untouched for more than a week: + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji + fdo#74111 3D Rotation is wrong after Round trip for pie chart in https://gerrit.libreoffice.org/7718 from Priyanka Gaikwad + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + fdo#69407: On transparent frames, shadows are painted in
Re: [Libreoffice-qa] last surviving mab4.0
On Fri, Feb 28, 2014 at 5:58 AM, Alex Thurgood alex.thurg...@gmail.com wrote: Still there, added my comment to bug report, the problem is even worse now with 4.2.0.4, any attempt to print to any one of my networked office printers with an envelope inserted in a blank Writer document causes the printers to jam during the print operation. Hmm...not good at all. The jam was repeatable 3 times in a row for both printers which, from a business perspective, is simply not a viable option. I'll make sure to ping additional people on this one. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 75578] Other: Improve Hyperlink Dialog Buttons
https://bugs.freedesktop.org/show_bug.cgi?id=75578 --- Comment #4 from Mirek2 maz...@gmail.com --- Hi Cor, (In reply to comment #3) (In reply to comment #0) The standard is for Apply to apply the changes and leave the dialog open, OK to apply the changes and close the dialog, Close to close the dialog (should be used when changes are applied automatically), Cancel to revert changes made and close the dialog, Undo to go a single step back in history, Back to navigate to the last visited screen. Do these standards also apply for non-modal dialogs? Yes. For example, see the Gnome [1], Windows [2], or Mac OS X HIG [3]. I'm no longer sure about Close, though. It seems that it doesn't discard the changes made with the window (it was impossible to tell when Apply closed the window), so it doesn't quite fit the role of Cancel: [Cancel] must undo the effects of all applications of the Apply since the window was opened, not just the most recent one. [1] And though the Windows HIG tells us to Never use Close for dialogs that have settings [1], perhaps it's the best description for the way the button currently works. So, in terms of the current hyperlink dialog: * There should be two buttons instead of the current Apply: Apply and OK, working as described above. If one clicks Apply .. hyperlink is inserted. The one chooses OK .. the link is inserted again plus that the dialog closes? That is what I understand from what you described above... When one clicks OK, the changes made in the dialog are applied and the dialog closes. If those changes have been applied already using Apply, then OK simply closes the dialog. * Close should be renamed to Cancel * Back should be renamed to Revert (Undo doesn't quite fit the bill, as the button doesn't go through each step in history); however, IMHO it'd be good to remove this button -- it does the same thing as Cancel, only without closing the dialog. Back sets the state of the dialog to it's default. It doesn't do anything with the already inserted links. Revert/Undo might give that impression more. It was impossible to tell when Apply closed the window, but now I see that it sets the state of the dialog to the last applied change. Perhaps Reset is a better term, then? (BTW, this button should be inactive if it won't do anything.) [1] https://developer.gnome.org/hig-book/stable/windows-utility.html.en#windows-explicit-apply [2] http://msdn.microsoft.com/en-us/library/windows/desktop/aa511268 [3] https://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/AppleHIGuidelines/Windows/Windows.html#//apple_ref/doc/uid/2961-TP9 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75601] New: UI: New options in Print configuration page
https://bugs.freedesktop.org/show_bug.cgi?id=75601 Priority: medium Bug ID: 75601 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: UI: New options in Print configuration page Severity: normal Classification: Unclassified OS: All Reporter: xdeyzagui...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.0.4 release Component: Printing and PDF export Product: LibreOffice Created attachment 94869 -- https://bugs.freedesktop.org/attachment.cgi?id=94869action=edit Print window capture in png format, edited with GIMP. This is a suggestion to improve the application: 1. - You can add the checkbox Two-Sided Printing? 2. - You can add the checkbox Print in Grayscale? Here are two options I need in 95% of my impressions. Thank you for your dedication. I attached a screenshot of the Catalan version. Operating System: All Version: 4.2.0.4 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73438] EDITING: REGRESSION: Copy and paste skews offset position with respect to grid (AGAIN, see 44990)
https://bugs.freedesktop.org/show_bug.cgi?id=73438 sergio.calleg...@gmail.com changed: What|Removed |Added Summary|EDITING: REGRESSION: Copy |EDITING: REGRESSION: Copy |and paste skews offset |and paste skews offset |position with respect to|position with respect to |grid (again, see 44990) |grid (AGAIN, see 44990) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73438] EDITING: REGRESSION: Copy and paste skews offset position with respect to grid (AGAIN, see 44990)
https://bugs.freedesktop.org/show_bug.cgi?id=73438 --- Comment #4 from sergio.calleg...@gmail.com --- Still present in LibO 4.2.2 RC 1. Please, try to have it fixed before 4.1 goes EOL. This makes drawing with non-null line widths a big pain. Also note: This bug was first introduced in 3.5.0 - fixed in 3.6.2.2 Reintroduced in 4.2.0 Maybe same fix that went in 3.6.2.2 can still apply. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75578] Other: Improve Hyperlink Dialog Buttons
https://bugs.freedesktop.org/show_bug.cgi?id=75578 --- Comment #5 from Dave Barton d...@tasit.net --- Created attachment 94871 -- https://bugs.freedesktop.org/attachment.cgi?id=94871action=edit Concept for revamped Hyperlink dialog. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75563] Open Extension Manager from Extension button in the new Start Center
https://bugs.freedesktop.org/show_bug.cgi?id=75563 --- Comment #4 from Adolfo Jayme f...@libreoffice.org --- (In reply to comment #3) Then how is one supposed to find the Extension Manager if LO is opened by opening a document directly ? Of course, that is when you don’t have any document open. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75578] Other: Improve Hyperlink Dialog Buttons
https://bugs.freedesktop.org/show_bug.cgi?id=75578 --- Comment #6 from Dave Barton d...@tasit.net --- (In reply to comment #3) Hi Cor, To be honest the naming of the dialog buttons does not greatly concern me, provided that the Apply' (or whatever name is chosen) button does not close the dialog, but since you have asked for my opinion... In almost every program I have used over the years where there is an Apply button/option changes are immediately applied to the underlying data, without closing the dialog/editing facility. The fact that the LO Hyperlink dialog is modeless means that the user can select other items (eg. a Calc cell) and continue editing without having to be continually reopening the dialog. Apply appears to the most widely used and understood terminology for this kind of feature. Renaming the Close button to OK might be more intuitive for less experienced computer users, since OK is commonly used in other software to confirm the action/selection and close the dialog/editing facility. While I understand what the Back button does, I am unclear as to why it was included in the first place or if it serves a very useful purpose. The word Back is open to many interpretations and user expectations. I would suggest replacing the Back button and it's associated function with a simple and generally understood Close button to close the dialog without updating the underlying data. I suggest Close rather than Cancel, because Cancel might mislead some users into thinking it cancels, or reverts, any changes they have already applied. Yes, it can be argued that changing the function of an existing button with that name may be confusing to some existing users, but it seems that there is already some confusion about this dialog, otherwise this issue would have never been opened. The attached image, including suggested help/tooltip commentary, is my concept of what a revamped hyperlink dialog might look like. Regards Dave -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75577] Many perl errors when building LO packages
https://bugs.freedesktop.org/show_bug.cgi?id=75577 Jan-Marek Glogowski glo...@fbihome.de changed: What|Removed |Added Version|4.2.0.0.alpha0+ Master |4.1.0.0.alpha0+ Master --- Comment #2 from Jan-Marek Glogowski glo...@fbihome.de --- This bug is already in 4.1. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75563] Open Extension Manager from Extension button in the new Start Center
https://bugs.freedesktop.org/show_bug.cgi?id=75563 Stephan Bergmann sberg...@redhat.com changed: What|Removed |Added CC||sberg...@redhat.com --- Comment #5 from Stephan Bergmann sberg...@redhat.com --- ...but we also have the redundant File - New - Text Document etc. menu entries in the start center. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 36799] If you insert an envelope into a document only the envelope is printed (Mac OS X)
https://bugs.freedesktop.org/show_bug.cgi?id=36799 --- Comment #23 from Alex Thurgood ipla...@yahoo.co.uk --- Tested on 4.2.0.4 OSX 10.9 Not only is the problem still there, it has got worse... Whereas previously only the first page would print out, i.e. the envelope page, when I now try to print via either a Samsung CLX 375 FN or Kyocera CS5150DN (both are networked laser printers), I systematically get a jam of the first page within the printer resulting in hours of endless fun trying to retrieve the sheet/envelope/support on which the address has been printed. Of the second page, on which I had typed the word test and pressed the return key, there is no sign. The second page does not even display in the Print as PDF Preview provided by the underlying OS. Alex -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 36799] If you insert an envelope into a document only the envelope is printed (Mac OS X)
https://bugs.freedesktop.org/show_bug.cgi?id=36799 tommy27 ba...@quipo.it changed: What|Removed |Added Blocks|54157 |60270 --- Comment #24 from tommy27 ba...@quipo.it --- thanks Alex. moving to the mab4.1 list. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||36799 -- You are receiving this mail because: You are on the CC list for the bug. You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|36799 | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 ba...@quipo.it changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #192 from tommy27 ba...@quipo.it --- CLOSING since 4.0.x reached end of life. all still open bugs have been moved to the mab4.1 list. please do not add anymore bugs to the current list. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 ba...@quipo.it changed: What|Removed |Added Status|RESOLVED|CLOSED -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70236] FILEOPEN: Cannot connect to .accdb file in LibreOffice 4.1
https://bugs.freedesktop.org/show_bug.cgi?id=70236 --- Comment #3 from Ben Trewern ben.trew...@hotmail.com --- Just tested again in LO 4.2.1.1 and still only an option to open .mdb files. This currently works correctly in OO 4.0.1 so sadly I've had to change over. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75603] New: TABLE: Table textflow 0 not respected as continuation of numbering
https://bugs.freedesktop.org/show_bug.cgi?id=75603 Priority: medium Bug ID: 75603 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: TABLE: Table textflow 0 not respected as continuation of numbering Severity: normal Classification: Unclassified OS: Windows (All) Reporter: m.menhe...@gmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.2.1.1 release Component: Writer Product: LibreOffice Created attachment 94872 -- https://bugs.freedesktop.org/attachment.cgi?id=94872action=edit Document with several pages and a table on page 3. Pagenumbering is not continued Problem description: Steps to reproduce: 1. Insert a couple of pages 2. Create new page style 3. Insert a table 4. Edit table properties 5. Select break with page style, and select the new style 6. Enter 0 for pagenumber to continue pagenumbering 7. Page where the table is present has page number 0 Current behavior: Page number is 0 Expected behavior: Pagenumbering is continued, should be 3 Operating System: Windows 8 Version: 4.2.1.1 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75604] New: File Corruption: Issue related to the nested mc:AlternateContent in document.xml
https://bugs.freedesktop.org/show_bug.cgi?id=75604 Priority: medium Bug ID: 75604 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: File Corruption: Issue related to the nested mc:AlternateContent in document.xml Severity: normal Classification: Unclassified OS: All Reporter: yogesh.bhar...@synerzip.com Hardware: Other Status: UNCONFIRMED Version: 4.3.0.0.alpha0+ Master Component: Writer Product: LibreOffice Created attachment 94873 -- https://bugs.freedesktop.org/attachment.cgi?id=94873action=edit document contains nested text boxes Problem description: 1. document contains the text boxes (some are nested text box) 2. In document.xml, nested AlternateContent present. 3. Due to this the file get corrupted and gives error You cannot put drawing object into the text box, callout, comment, footnote or endnote while opening file in MS Office 2010 word. Steps to reproduce: 1. Open the file in LibreOffice 2. Click File - Save As (Microsoft Word 2007/2010 (.docx)) 3. Open saved file in MS Office Expected: File should open without any error. Actual: File corrupt dialog is shown -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75605] New: 4.2.1 double line cell borders print center line
https://bugs.freedesktop.org/show_bug.cgi?id=75605 Priority: medium Bug ID: 75605 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: 4.2.1 double line cell borders print center line Severity: normal Classification: Unclassified OS: Windows (All) Reporter: toomanyb...@maildrop.cc Hardware: Other Status: UNCONFIRMED Version: unspecified Component: Writer Product: LibreOffice When using 4.2.1 my forms print incorrectly. When formatting my cells with double lines as borders within a table, printing the form prints a single line as the border and adds a thin center line in the middle of the cell. I have had to re-install 4.2.0 so that I can print my forms correctly. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75604] File Corruption: Issue related to the nested mc:AlternateContent in document.xml
https://bugs.freedesktop.org/show_bug.cgi?id=75604 Yogesh Bharate yogesh.bhar...@synerzip.com changed: What|Removed |Added Hardware|Other |IA64 (Itanium) OS|All |Linux (All) Assignee|libreoffice-b...@lists.free |yogesh.bhar...@synerzip.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 39936] UI: Right Click on Row/Column - Insert Copied Cells... (paste + shift cells in one click)
https://bugs.freedesktop.org/show_bug.cgi?id=39936 Charles tansta...@libertytrek.org changed: What|Removed |Added CC||tansta...@libertytrek.org --- Comment #34 from Charles tansta...@libertytrek.org --- I was just pointed to this bug after *years* of minor frustration at having to do the - insert new target row/columns, cut source row/columns, paste to the new blank target row/columns, delete original source columns - dance, I finally decided to ask for help on the users list, and after a short time, discovered that I had been totally missing BOTH the 'Paste Special' method, and much better, the ability to MOVE rows and columns using drag-n-drop, just as you can groups of selected cells (which I already knew about, and used a lot). So, here are some points I'd like to make... 1. Anyone coming from Excel trying out Libreoffice (or Openoffice), who encounters this issue, will definitely declare this a problem, the severity determined by how often they use it - the more they use the Excel feature, the more serious the problem will appear to them. 2. The Help text that describes moving cells, does not mention anywhere that this also applies to entire rows and columns. The Help documentation definitely needs to be updated. I will file a bug/enhancement for that in a bit, along with some suggested new text. It simply never occurred to me to click (grab) down in the CONTENT after selecting a row or column. I must say it was a major revelation, followed by wailing and gnashing of teeth at the many years I have missed something so blatantly obvious (hindsight and all), floundering with the above roundabout way. And since I, a SysAdmin, been doing I.T. related stuff, including end-user support for things like this and who considers himself very technically inclined, never figured this out myself using the Help or Google, and only did so after asking on the list (admittedly I should have done that years ago, but the fact is I didn't do this dance all that often, which is why I termed it a source of 'minor frustration' for me)), I venture to guess that most others would never discover the drag-n-drop method (which indeed is very cool!), and would be just one more potential user who tried Libreoffice and left in frustration. I'm not saying Libreoffice should try to emulate every single Excel feature, but the ones that are very useful, and may not be too much work, should absolutely be considered. 3. The 'Paste Special' still leaves the source row/columns in place. I consider this a bug. If you CUT an entire row/column, it should CUT the entire row/column, not just the content in the cells in the row/column. Does anyone know if there is already a bug open for that? If not I'll open one later, when I enter the bug for updating the documentation. 4. I really like the new (to me) graphical drag-n-drop method, but for most cases I think the Excel way is quicker and what I'd prefer to use - just select the row/columns you want to move, right-click Cut[Copy], then right-click Insert Cut[Copied] Row(s)[Column(s) on the row/column header above/to-the-left-of which you want to insert the Cut[Copied] row/columns. Note: Excel options are labeled 'Insert Cut[Copied] Cells', regardless of if you cut/copied a group of cells, or entire row/columns. I think this is wrong. Libreoffice, if this is implemented, should distinguish between 'cells', and entire row/columns. If the user cut just a group of selected cells within a sheet, then the choice should say 'Cells', but if they selected entire row/columns, then the choice should reflect that as 'Rows' (or 'Columns'). I think if Libreoffice implemented both ways, and documented these properly, it would be yet another way that it can be considered superior to MSO... -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75601] UI: New options in Print configuration page
https://bugs.freedesktop.org/show_bug.cgi?id=75601 --- Comment #1 from Adolfo Jayme f...@libreoffice.org --- These options are typically already located on your printer’s Propietats… -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75578] Other: Improve Hyperlink Dialog Buttons
https://bugs.freedesktop.org/show_bug.cgi?id=75578 --- Comment #7 from Adolfo Jayme f...@libreoffice.org --- Apply, OK and Close are super redundant, even though they have slightly different behaviors. Please don’t cramp the together in a single dialog, Apply and Close are enough… -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 75434] VIEWING: Main Window too large on Netbook Screen 1024x600
https://bugs.freedesktop.org/show_bug.cgi?id=75434 u.fu...@yahoo.de changed: What|Removed |Added Version|4.2.0.4 release |4.2.1.1 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 64789] FILEOPEN: docx opening with images containing drop shadows
https://bugs.freedesktop.org/show_bug.cgi?id=64789 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Keywords||regression --- Comment #8 from Björn Michaelsen bjoern.michael...@canonical.com --- Bulk change: Bibisected bugs can be assumed to be regressions. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 41468] FILEOPEN particular MSO2007 .docx file has excessively wide table, making the document unreadable
https://bugs.freedesktop.org/show_bug.cgi?id=41468 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Keywords||regression --- Comment #10 from Björn Michaelsen bjoern.michael...@canonical.com --- Bulk change: Bibisected bugs can be assumed to be regressions. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45701] PRINTING: Allow printing multiple copies of a page on a single sheet of paper
https://bugs.freedesktop.org/show_bug.cgi?id=45701 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Keywords||regression --- Comment #19 from Björn Michaelsen bjoern.michael...@canonical.com --- Bulk change: Bibisected bugs can be assumed to be regressions. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 46864] FILEOPEN particular .RTF does not show different character styles in a line
https://bugs.freedesktop.org/show_bug.cgi?id=46864 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Keywords||regression --- Comment #4 from Björn Michaelsen bjoern.michael...@canonical.com --- Bulk change: Bibisected bugs can be assumed to be regressions. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 39505] tables, pictures, frame invisible in particular WW8 document
https://bugs.freedesktop.org/show_bug.cgi?id=39505 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Keywords||regression --- Comment #34 from Björn Michaelsen bjoern.michael...@canonical.com --- Bulk change: Bibisected bugs can be assumed to be regressions. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 58300] FILEOPEN: lost bibliography entries/empty bibliography index when saving as .doc or .docx
https://bugs.freedesktop.org/show_bug.cgi?id=58300 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Keywords||regression --- Comment #13 from Björn Michaelsen bjoern.michael...@canonical.com --- Bulk change: Bibisected bugs can be assumed to be regressions. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 36582] Find and replace finds/replaces text deleted with record/track changes
https://bugs.freedesktop.org/show_bug.cgi?id=36582 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Keywords||regression --- Comment #9 from Björn Michaelsen bjoern.michael...@canonical.com --- Bulk change: Bibisected bugs can be assumed to be regressions. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
