icon-themes/galaxy/links.txt | 6 ++++++
sw/source/core/layout/flycnt.cxx | 2 ++
vcl/source/window/toolbox2.cxx | 10 +++++++++-
3 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 477a1f2c60e80efda3cdef3e3b22bf483819e97d
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Mar 25 02:23:32 2016 +0100
tdf#96484: Missing Icons in Find Toolbar with Icon Style Galaxy
- add the relevant links to galaxys link.txt
- reportedly a regression from b6d1a5f0, though I cant see how that
commit might be guilty here
Change-Id: Ibfb0a2c9fe5db51297b4c697ce81394f9327fb89
diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 18e589d..8decd02 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -105,3 +105,9 @@ cmd/lc_mailmergenextentry.png cmd/lc_nextrecord.png
cmd/sc_mailmergenextentry.png cmd/sc_nextrecord.png
cmd/lc_mailmergepreventry.png cmd/lc_prevrecord.png
cmd/sc_mailmergepreventry.png cmd/sc_prevrecord.png
+
+# Find Toolbar
+cmd/lc_scrolltonext.png cmd/lc_downsearch.png
+cmd/sc_scrolltonext.png cmd/sc_downsearch.png
+cmd/lc_scrolltoprevious.png cmd/lc_upsearch.png
+cmd/sc_scrolltoprevious.png cmd/sc_upsearch.png
commit 7296b98445f270beb73cf07d22fc4263fdaff53f
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Mar 25 01:44:19 2016 +0100
fix another involuntary behaviour change from 0c5cbcd7
Change-Id: Idd8e48777b2a5e8e91754ec0afa9dd5b50d8bf00
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index f95b4a6..cafb5c3 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -1217,6 +1217,8 @@ void SwFlyAtContentFrame::SetAbsPos( const Point &rNew )
nY = pCnt->Frame().Left() - rNew.X();
if ( bVertL2R )
nY = -nY;
+ else
+ nY += pCnt->Frame().Width() - Frame().Width();
nY -= pCnt->GetUpperSpaceAmountConsideredForPrevFrameAndPageGrid();
}
else
commit 600ad9d1552e5458bb0a8c47c892bebe219ebb01
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Mar 25 01:29:08 2016 +0100
tdf#94734: fix icon in sidebar disappears when changing font colour
- properly initalize maImageOriginal along with maImage in various
places
- this is a regression from 27d94c482e82ea5d4f202109614c6fb3578fb0a4
- that commit is mostly innocent in itself though, only exposing
omissions from b8f21298288890d52c06fef6c84441634c56c986
- having both maImage and maImageOriginal is extremely fragile as-is --
likely I'd be helpful to have them private in ImplToolItem and then a
SetImage accessor with a tristate eOriginal/eCached/eBoth enum
parameter to prevent oversights like this in the future ...
Change-Id: I294d7ed8e07be5cadec0ae251cc08c8d089bd059
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index f52211f..ff15361 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -106,7 +106,8 @@ ImplToolItem::ImplToolItem()
ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage,
ToolBoxItemBits nItemBits ) :
- maImage( rImage )
+ maImage( rImage ),
+ maImageOriginal( rImage )
{
init(nItemId, nItemBits, false);
}
@@ -121,6 +122,7 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const
OUString& rText,
ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage,
const OUString& rText, ToolBoxItemBits nItemBits )
:
maImage( rImage ),
+ maImageOriginal( rImage ),
maText( rText )
{
init(nItemId, nItemBits, false);
@@ -130,6 +132,7 @@ ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) :
mpWindow ( rItem.mpWindow ),
mpUserData ( rItem.mpUserData ),
maImage ( rItem.maImage ),
+ maImageOriginal ( rItem.maImageOriginal ),
mnImageAngle ( rItem.mnImageAngle ),
mbMirrorMode ( rItem.mbMirrorMode ),
maText ( rItem.maText ),
@@ -168,6 +171,7 @@ ImplToolItem& ImplToolItem::operator=( const ImplToolItem&
rItem )
mpWindow = rItem.mpWindow;
mpUserData = rItem.mpUserData;
maImage = rItem.maImage;
+ maImageOriginal = rItem.maImageOriginal;
mnImageAngle = rItem.mnImageAngle;
mbMirrorMode = rItem.mbMirrorMode;
maText = rItem.maText;
@@ -484,6 +488,7 @@ void ToolBox::InsertItem( const ResId& rResId )
Bitmap aBmp = Bitmap( ResId(
static_cast<RSHEADER_TYPE*>(GetClassRes()), *rResId.GetResMgr() ) );
IncrementRes( GetObjSizeRes(
static_cast<RSHEADER_TYPE*>(GetClassRes()) ) );
aItem.maImage = Image( aBmp, IMAGE_STDBTN_COLOR );
+ aItem.maImageOriginal = aItem.maImage;
bImage = true;
}
if ( nObjMask & RSC_TOOLBOXITEM_IMAGE )
@@ -506,7 +511,10 @@ void ToolBox::InsertItem( const ResId& rResId )
// if no image is loaded, try to load one from the image list
if ( !bImage && aItem.mnId )
+ {
aItem.maImage = maImageList.GetImage( aItem.mnId );
+ aItem.maImageOriginal = aItem.maImage;
+ }
// if this is a ButtonItem, check ID
bool bNewCalc;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
