Reported by: Yan Ji
Patch by: Chen Zuo Jun
Review by: Lei De Bin (cherry picked from commit fe549458ef04384ba777e4a36f34b68efc5b8b6d)
Conflicts:
filter/source/msfilter/msdffimp.cxx
sw/source/filter/ww8/wrtw8esh.cxx
Change-Id: I863ea7193f3dee563a892a6d857ee2385f58a862
This line was removed with dd3e879cfd but
is needed. Special thanks to Joren for bibisecting and bisecting.
Change-Id: Id2b3de4098db75571006e6e62b77efe8c491b06f
Reported by: Li Feng Wang
Patch by: Ying Sun
Review by: Jian Yuan Li
(cherry picked from commit fbb7e8d8957877922f2f3a971e88685589f43939)
Conflicts:
filter/inc/filter/msfilter/escherex.hxx
filter/source/msfilter/escherex.cxx
Change-Id: I545a9e95c23cfba0cc918c9c4243528570734b2d
...as otherwise this can result in "inline function [...] used but never defined
[-Werror]" for SwFmt::GetULSpace and SwFmt::GetLRSpace.
Change-Id: I9de3422953b38c978af1e7d2fc07398b83236ed6
Some special characters, like { and }, were not skipped when they
occured as a replacement character for \uN keyword.
Change-Id: I19b66a290cd9880924774fa89bb29df280e44a3c
After f22006dc6a the position member of
SwDrawTextInfo is no longer a pointer, so changing the passed Point
after calling SetPos() has no effect, but some code seems to be relying
on it being pointer. Moving SetPos() to after changing the point seems
to do the trick, but there may be other similarly broken code like
SwSubFont::_DrawStretchText() below.
Change-Id: I2f563c1543ff7bff68e573f69fce39694181b370
Reviewed-on: https://gerrit.libreoffice.org/4032
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
If QStyle::SH_MenuBar_MouseTracking is 0, it makes a mouse rollover
effect minimize. By this, a menubar item of CDE and Motif styles becomes
closer to standard behavior.
Change-Id: I87dccbd30bf7b9f0d82d1a6e67355c1b25d22dc8
Reviewed-on: https://gerrit.libreoffice.org/4018
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Currently, menubar's background is drawn in window's background color
and no menubar's specific background color. To fix this, The patch
calls QStyle::drawControl() with QStyle::CE_MenuBarEmptyArea.
Change-Id: I89b9decc016a926a0f00b9663ec1a5bce81daac1
Reviewed-on: https://gerrit.libreoffice.org/4025
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
A selected menubar item of cleanlooks, gtk+ and plastique styles
becomes closer to standard looks by passing QStyle::State_Sunken
with QStyle::CE_MenuBarItem to QStyle::drawControl(). It is
currently not documented on QT developmet resources. But these
styles interpret that.
Change-Id: Ic7835bf0bf7af374ebdf8330d15b462d056de8a5
Reviewed-on: https://gerrit.libreoffice.org/4017
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Some small clean-up to use the PopupMenu ToolbarController
(cherry picked from commit e1687ce159e787d98f79d29a3d2131cca4b6ec71)
Conflicts:
svtools/inc/svtools/toolboxcontroller.hxx
svtools/source/uno/toolboxcontroller.cxx
Change-Id: Ie5e0397c32352d52cf2664bdbab920923e74bd03
Reported by: Li Feng Wang
Patch by: Ying Sun
Review by: Jian Yuan Li
(cherry picked from commit 8d04823a6038d32f6ac9821925616da7c5cc44c9)
Conflicts:
filter/inc/filter/msfilter/svdfppt.hxx
sd/source/filter/ppt/pptin.cxx
Change-Id: I222003a9e8d474ebc4dd9bc83cdcceded88a79f4
1. A typo in export.cxx makes not working replacing
2. EscapeAll() ignored single backlash characters
Change-Id: I1a5309778acdd601391f643ebf3c66d04a6601d4
when created in the FmXUndoEnvironment ctor it is never released
Found by: zhangjf
Patch by: zhangjf
(cherry picked from commit d52fc99575db0d30b19a69dadcd2c3544584ecab)
Change-Id: Iaeba1018551441f3bb13f90d3d42ac2855e285e6
before they are used
(cherry picked from commit 7d6c5e79a17aa2ff392433667187c4bfe4ee2432)
Conflicts:
svx/inc/svx/sdasitm.hxx
svx/source/items/customshapeitem.cxx
Change-Id: Iac3e37bcfd4ab26d97411092259da2cc1879c2de
This reverts commit 979def8809,
this time manually confirmed that the import layout does change, but that it
appears to be all desirable changes
Change-Id: Iee5e5ebd16989f65569b02f8b4f6570985157dfc
with the corresponding TR1 container
The TR1 containers don't support dynamic hash functions provided in their
constructor. Having the hash functor as part the hash container's type is
cleaner anyway.
(cherry picked from commit fb8df93381493dee3d0e511c556d82d1f177367a)
Conflicts:
animations/source/animcore/targetpropertiescreator.cxx
Change-Id: I51ae91ef74002cbc8f24cd5f4df7dda58e1c4f8d
This reverts commit cef3f3aac2f7a372e796deac4ee3e8155c5eb697.
The previous commit addressed the real issue.
Change-Id: I802e5f19e4a4991c316135f3984a1b9a6533a104
We need a way to recognize non spacing marks in fonts lacking GDEF table
(like old Arabic fonts), so I just check for zero advance width and hope
nothing elsewhere will break...
Change-Id: I6fa848e97ba24d71fc9a381ae439e0fb98e50419
This reverts commit 6c61b20a8d. As discussed at
<http://lists.freedesktop.org/archives/libreoffice/2013-May/052449.html> "Re:
fdo#46808, Convert awt::UnoControlDialogModel to new style problem" why the odd
change in 2e2a4827ce "scripting: get
CreateUnoDialog() work again" appears to fix things again:
The problem is that the implementation of the css.awt.UnoControlDialogModel
involves UNO aggregation
(IMPL_CREATE_INSTANCE_WITH_GEOMETRY(UnoControlDialogModel) in
toolkit/soruce/helper/registerservices.cxx creating a
OGeometryControlModel<UnoControlDialogModel> instance that aggregates a
UnoControlDialogModel instance). That means that queryInterface can return a
reference to something that is technically a different object, and that's
what's happening here, and explains why calling setPropertyValue in two
different ways on what logically appears to be a single object can end up
calling two different implementations (of two different physical objects).
(UNO aggregation is known to be broken and should not be used. Nevertheless,
there's still code that does---code that is a horrible mess and hard to clean
up.)
That all this worked as intended in the past is just sheer luck, but any
way of substantially touching it is asking for trouble. I'm going to
revert 6c61b20a8d again.
I wasn't able to revert without also reverting
be50ad28f5 "fdo#46808, Convert
awt::XUnoControlDialog to new style," as the two were tightly dependant. Also
reverts all the follow-up fixes cb4b6dde8f
"-Werror,-Wuninitialized" (sans the const-ness fix in
UpdateHandler::insertControlModel), 697a007c61
"Fix exception specifications," 2ce6828bbb "fix
awt::UnoControlModelDialog crash," and 2e2a4827ce
"scripting: get CreateUnoDialog() work again."
Conflicts:
basctl/source/dlged/dlged.cxx
filter/source/t602/t602filter.cxx
xmlscript/test/imexp.cxx
Change-Id: I5d133468062f3ca36300db52fbd699be1ac72998
