David Tardon
10 years ago
parent
14b15ff580
commit
bf8b87a8db
@ -1,57 +0,0 @@
|
||||
From 19839b479acd5637a08cb00ea6146bdb7fc8128b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Tue, 2 Dec 2014 17:42:55 +0000
|
||||
Subject: [PATCH] Only call super-expensive Invalidate on scrollbar toggling
|
||||
|
||||
otherwise even using backspace in an annotated area will cause super slow
|
||||
behaviour as each keystroke causes a full page render
|
||||
|
||||
This became a problem after
|
||||
|
||||
commit 0761f81643a6890457e9ef7d913ab5c88c2593a4
|
||||
Date: Thu Dec 19 18:50:58 2013 +0000
|
||||
123792: complete annotations on text ranges feature
|
||||
|
||||
but underlying problem was always there ready to trigger.
|
||||
|
||||
For this case only render the full page if the state
|
||||
of comments scrollbars *toggles*, i.e. if there wasn't
|
||||
scrollbars and there ends up still with no scrollbars
|
||||
avoid the (bad) hack of invalidating the page
|
||||
|
||||
(cherry picked from commit 378c74ce290ab772f962db51ff8cba200cb40144)
|
||||
|
||||
Conflicts:
|
||||
sw/source/uibase/docvw/PostItMgr.cxx
|
||||
|
||||
Change-Id: Ic7fd432d2317b0f5ad8d8773636f99fe75d660d6
|
||||
(cherry picked from commit 7e75eab406c5e58e40987ab8a249dbacbb685551)
|
||||
---
|
||||
sw/source/core/uibase/docvw/PostItMgr.cxx | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sw/source/core/uibase/docvw/PostItMgr.cxx b/sw/source/core/uibase/docvw/PostItMgr.cxx
|
||||
index d51ebff..b36e86f 100644
|
||||
--- a/sw/source/core/uibase/docvw/PostItMgr.cxx
|
||||
+++ b/sw/source/core/uibase/docvw/PostItMgr.cxx
|
||||
@@ -764,7 +764,8 @@ void SwPostItMgr::LayoutPostIts()
|
||||
}
|
||||
else
|
||||
{
|
||||
- bUpdate = true;
|
||||
+ if (mPages[n]->bScrollbar)
|
||||
+ bUpdate = true;
|
||||
mPages[n]->bScrollbar = false;
|
||||
}
|
||||
}
|
||||
@@ -796,7 +797,6 @@ void SwPostItMgr::LayoutPostIts()
|
||||
if ( bRepair )
|
||||
CheckForRemovedPostIts();
|
||||
}
|
||||
-
|
||||
// notes scrollbar is otherwise not drawn correctly for some cases
|
||||
// scrollbar area is enough
|
||||
if (bUpdate)
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
From 10924e1e0c3b88f5650994b6943193d23f99109d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Thu, 27 Nov 2014 11:30:45 +0000
|
||||
Subject: [PATCH] Resolves: fdo#84043 don't create duplicate Mirrored[X|Y]
|
||||
properties
|
||||
|
||||
regression from 13ef16423e78d3ea825172594f08c47d2f9bfd09
|
||||
|
||||
commit 13ef16423e78d3ea825172594f08c47d2f9bfd09
|
||||
Author: Armin Le Grand <alg@apache.org>
|
||||
Date: Wed Nov 21 13:23:01 2012 +0000
|
||||
|
||||
For backward compatibility take mirrorings in setTransformation into account
|
||||
|
||||
Also found an error in SdrObjCustomShape::TRGetBaseGeometry when MirrorY was used
|
||||
|
||||
(cherry picked from commit 4116c33b12d3787c406f0348f89efcb1cf409507)
|
||||
|
||||
Change-Id: I7bfb5dea32b8ab8498e3d92975c49b830c81e6fb
|
||||
(cherry picked from commit 751e5b32c5c361995bf0ba3295f773341fd92c23)
|
||||
---
|
||||
xmloff/source/draw/ximpshap.cxx | 32 ++++++++++++++++++++++++--------
|
||||
1 file changed, 24 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
|
||||
index 74bb00c..6a8c77a 100644
|
||||
--- a/xmloff/source/draw/ximpshap.cxx
|
||||
+++ b/xmloff/source/draw/ximpshap.cxx
|
||||
@@ -3832,22 +3832,38 @@ void SdXMLCustomShapeContext::EndElement()
|
||||
|
||||
if(bFlippedX || bFlippedY)
|
||||
{
|
||||
- beans::PropertyValue aNewPoroperty;
|
||||
+ OUString sName;
|
||||
|
||||
if(bFlippedX)
|
||||
+ sName = "MirroredX";
|
||||
+ else
|
||||
+ sName = "MirroredY";
|
||||
+
|
||||
+ //fdo#84043 overwrite the property if it already exists, otherwise append it
|
||||
+ beans::PropertyValue* pItem;
|
||||
+ std::vector< beans::PropertyValue >::iterator aI(maCustomShapeGeometry.begin());
|
||||
+ std::vector< beans::PropertyValue >::iterator aE(maCustomShapeGeometry.end());
|
||||
+ while (aI != aE)
|
||||
+ {
|
||||
+ if (aI->Name == sName)
|
||||
+ break;
|
||||
+ ++aI;
|
||||
+ }
|
||||
+ if (aI != aE)
|
||||
{
|
||||
- aNewPoroperty.Name = "MirroredX";
|
||||
+ beans::PropertyValue& rItem = *aI;
|
||||
+ pItem = &rItem;
|
||||
}
|
||||
else
|
||||
{
|
||||
- aNewPoroperty.Name = "MirroredY";
|
||||
+ maCustomShapeGeometry.push_back(beans::PropertyValue());
|
||||
+ pItem = &maCustomShapeGeometry.back();
|
||||
}
|
||||
|
||||
- aNewPoroperty.Handle = -1;
|
||||
- aNewPoroperty.Value <<= sal_True;
|
||||
- aNewPoroperty.State = beans::PropertyState_DIRECT_VALUE;
|
||||
-
|
||||
- maCustomShapeGeometry.push_back(aNewPoroperty);
|
||||
+ pItem->Name = sName;
|
||||
+ pItem->Handle = -1;
|
||||
+ pItem->Value <<= sal_True;
|
||||
+ pItem->State = beans::PropertyState_DIRECT_VALUE;
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@ -1,119 +0,0 @@
|
||||
From e91ab2104b62b689dca2c565cd81a8cb40885822 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Thu, 20 Nov 2014 15:53:14 +0000
|
||||
Subject: [PATCH] Resolves: fdo#86466 Wrong background color shown in format
|
||||
table in impress
|
||||
|
||||
regression from
|
||||
|
||||
commit 440e2031ce8cffc8dc573e359a330236f9c11dfb
|
||||
bnc#882627: Allow to edit spacing to contents even with no borders visible.
|
||||
|
||||
which was an attempt to fix regression from
|
||||
|
||||
commit 9e5342509b302ba1f816f21cc3ad1cb7093982e0
|
||||
Date: Mon Jun 3 14:22:07 2013 +0200
|
||||
|
||||
copy values from the original item set
|
||||
|
||||
... because SfxAbstractDialog::GetOutputItemSet() only contains the
|
||||
items that have been _changed_ in the dialog.
|
||||
|
||||
Now format color shows the expected color, and loading the sample for
|
||||
bnc#882627 and selecting cells and changing the border distance (etc) doesn't
|
||||
cause bulleting and paragraph alignment properties to be stripped away
|
||||
|
||||
Change-Id: Id414e09faa221d151f393971654b17bbe9f46d81
|
||||
---
|
||||
svx/source/table/tablecontroller.cxx | 44 ++++++++++++++++++++++++++----------
|
||||
1 file changed, 32 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
|
||||
index f5b4c99..c028a2a 100644
|
||||
--- a/svx/source/table/tablecontroller.cxx
|
||||
+++ b/svx/source/table/tablecontroller.cxx
|
||||
@@ -856,6 +856,19 @@ void SvxTableController::onSelect( sal_uInt16 nSId )
|
||||
}
|
||||
}
|
||||
|
||||
+namespace
|
||||
+{
|
||||
+ SvxBoxItem mergeDrawinglayerTextDistancesAndSvxBoxItem(const SfxItemSet& rAttrSet)
|
||||
+ {
|
||||
+ // merge drawing layer text distance items into SvxBoxItem used by the dialog
|
||||
+ SvxBoxItem aBoxItem( static_cast< const SvxBoxItem& >( rAttrSet.Get( SDRATTR_TABLE_BORDER ) ) );
|
||||
+ aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( static_cast<const SdrMetricItem&>(rAttrSet.Get(SDRATTR_TEXT_LEFTDIST)).GetValue()), BOX_LINE_LEFT );
|
||||
+ aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( static_cast<const SdrMetricItem&>(rAttrSet.Get(SDRATTR_TEXT_RIGHTDIST)).GetValue()), BOX_LINE_RIGHT );
|
||||
+ aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( static_cast<const SdrMetricItem&>(rAttrSet.Get(SDRATTR_TEXT_UPPERDIST)).GetValue()), BOX_LINE_TOP );
|
||||
+ aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( static_cast<const SdrMetricItem&>(rAttrSet.Get(SDRATTR_TEXT_LOWERDIST)).GetValue()), BOX_LINE_BOTTOM );
|
||||
+ return aBoxItem;
|
||||
+ }
|
||||
+}
|
||||
|
||||
void SvxTableController::onFormatTable( SfxRequest& rReq )
|
||||
{
|
||||
@@ -870,15 +883,11 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
|
||||
SfxItemSet aNewAttr( pTableObj->GetModel()->GetItemPool() );
|
||||
|
||||
// merge drawing layer text distance items into SvxBoxItem used by the dialog
|
||||
- SvxBoxItem aBoxItem( static_cast< const SvxBoxItem& >( aNewAttr.Get( SDRATTR_TABLE_BORDER ) ) );
|
||||
- aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( static_cast<const SdrMetricItem&>(aNewAttr.Get(SDRATTR_TEXT_LEFTDIST)).GetValue()), BOX_LINE_LEFT );
|
||||
- aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( static_cast<const SdrMetricItem&>(aNewAttr.Get(SDRATTR_TEXT_RIGHTDIST)).GetValue()), BOX_LINE_RIGHT );
|
||||
- aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( static_cast<const SdrMetricItem&>(aNewAttr.Get(SDRATTR_TEXT_UPPERDIST)).GetValue()), BOX_LINE_TOP );
|
||||
- aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( static_cast<const SdrMetricItem&>(aNewAttr.Get(SDRATTR_TEXT_LOWERDIST)).GetValue()), BOX_LINE_BOTTOM );
|
||||
+ SvxBoxItem aBoxItem(mergeDrawinglayerTextDistancesAndSvxBoxItem(aNewAttr));
|
||||
|
||||
SvxBoxInfoItem aBoxInfoItem( static_cast< const SvxBoxInfoItem& >( aNewAttr.Get( SDRATTR_TABLE_BORDER_INNER ) ) );
|
||||
|
||||
- MergeAttrFromSelectedCells(aNewAttr, true);
|
||||
+ MergeAttrFromSelectedCells(aNewAttr, false);
|
||||
FillCommonBorderAttrFromSelectedCells( aBoxItem, aBoxInfoItem );
|
||||
aNewAttr.Put( aBoxItem );
|
||||
aNewAttr.Put( aBoxInfoItem );
|
||||
@@ -888,8 +897,21 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
|
||||
// Even Cancel Button is returning positive(101) value,
|
||||
if( pDlg.get() && ( pDlg->Execute() == RET_OK ) )
|
||||
{
|
||||
- SfxItemSet aNewSet( aNewAttr );
|
||||
- aNewSet.Put( *(pDlg->GetOutputItemSet ()) );
|
||||
+ SfxItemSet aNewSet( *(pDlg->GetOutputItemSet ()) );
|
||||
+
|
||||
+ //Only properties that were unchanged by the dialog appear in this
|
||||
+ //itemset. We had constructed these two properties from other
|
||||
+ //ones, so if they were not changed, then forcible set them back to
|
||||
+ //their originals in the new result set so we can decompose that
|
||||
+ //unchanged state back to their input properties
|
||||
+ if (aNewSet.GetItemState(SDRATTR_TABLE_BORDER, false) != SfxItemState::SET)
|
||||
+ {
|
||||
+ aNewSet.Put(aBoxItem);
|
||||
+ }
|
||||
+ if (aNewSet.GetItemState(SDRATTR_TABLE_BORDER_INNER, false) != SfxItemState::SET)
|
||||
+ {
|
||||
+ aNewSet.Put(aBoxInfoItem);
|
||||
+ }
|
||||
|
||||
SvxBoxItem aNewBoxItem( static_cast< const SvxBoxItem& >( aNewSet.Get( SDRATTR_TABLE_BORDER ) ) );
|
||||
|
||||
@@ -910,8 +932,6 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
|
||||
}
|
||||
}
|
||||
|
||||
-
|
||||
-
|
||||
void SvxTableController::Execute( SfxRequest& rReq )
|
||||
{
|
||||
const sal_uInt16 nSId = rReq.GetSlot();
|
||||
@@ -2949,8 +2969,8 @@ void SvxTableController::FillCommonBorderAttrFromSelectedCells( SvxBoxItem& rBox
|
||||
nCellFlags |= (nCol > aEnd.mnCol) ? CELL_AFTER : 0;
|
||||
|
||||
const SfxItemSet& rSet = xCell->GetItemSet();
|
||||
- const SvxBoxItem& rCellBoxItem = static_cast< const SvxBoxItem& >( rSet.Get(SDRATTR_TABLE_BORDER ) );
|
||||
- lcl_MergeCommonBorderAttr( aLinesState, rCellBoxItem, nCellFlags );
|
||||
+ SvxBoxItem aCellBoxItem(mergeDrawinglayerTextDistancesAndSvxBoxItem(rSet));
|
||||
+ lcl_MergeCommonBorderAttr( aLinesState, aCellBoxItem, nCellFlags );
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From 755209d88073fd497b884b8de1348ec75c2df7eb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Wed, 19 Nov 2014 16:39:55 +0000
|
||||
Subject: [PATCH] Resolves: rhbz#1165444 abrt crash with NULL pView
|
||||
|
||||
Change-Id: I37f02f16209f274cf0358defba6bfa109948990f
|
||||
---
|
||||
sc/source/ui/view/gridwin.cxx | 7 ++-----
|
||||
1 file changed, 2 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
|
||||
index e8defd1..7b27f0c 100644
|
||||
--- a/sc/source/ui/view/gridwin.cxx
|
||||
+++ b/sc/source/ui/view/gridwin.cxx
|
||||
@@ -5183,12 +5183,9 @@ bool ScGridWindow::GetEditUrl( const Point& rPos,
|
||||
ScInputHandler* pInputHdl = NULL;
|
||||
if (pViewSh)
|
||||
pInputHdl = pViewSh->GetInputHandler();
|
||||
-
|
||||
- if (pInputHdl && pInputHdl->IsInputMode())
|
||||
- {
|
||||
- EditView* pView = pInputHdl->GetTableView();
|
||||
+ EditView* pView = (pInputHdl && pInputHdl->IsInputMode()) ? pInputHdl->GetTableView() : NULL;
|
||||
+ if (pView)
|
||||
return extractURLInfo(pView->GetFieldUnderMousePointer(), pName, pUrl, pTarget);
|
||||
- }
|
||||
|
||||
//! nPosX/Y mit uebergeben?
|
||||
SCsCOL nPosX;
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From 0b3976fe49ddf6324c9c61842d3f01f89566c4c9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
||||
Date: Tue, 25 Nov 2014 15:56:29 +0000
|
||||
Subject: [PATCH] Revert "Resolves: #i63015# always default to
|
||||
WinAnsiEncoding..."
|
||||
|
||||
Because under Linux use text
|
||||
"'"
|
||||
and font "Nimbus Sans L"
|
||||
and export as pdf and the output is garbled
|
||||
|
||||
If we do want to stick WinAnsiEncoding here then we'll presumably have have to
|
||||
test that pEncoding actually matches WinAnsiEncoding and/or generate an
|
||||
additional Encoding/Differences from WinAnsiEncoding for that font.
|
||||
|
||||
This reverts commit eea16cb3e65a4308caddb7618d31a76ca259dbb1.
|
||||
|
||||
(cherry picked from commit 297b22bd49ea11a90063ab8503fb83090f351668)
|
||||
|
||||
Change-Id: I9dd8de2a68ad276cce769545186d169160880e09
|
||||
---
|
||||
vcl/source/gdi/pdfwriter_impl.cxx | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
|
||||
index 5548629..2f44dd5 100644
|
||||
--- a/vcl/source/gdi/pdfwriter_impl.cxx
|
||||
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
|
||||
@@ -3491,7 +3491,7 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const Physical
|
||||
"<</Type/Font/Subtype/Type1/BaseFont/" );
|
||||
appendName( aInfo.m_aPSName, aLine );
|
||||
aLine.append( "\n" );
|
||||
- if( !pFont->IsSymbolFont() )
|
||||
+ if( !pFont->IsSymbolFont() && pEncoding == 0 )
|
||||
aLine.append( "/Encoding/WinAnsiEncoding\n" );
|
||||
if( nToUnicodeStream )
|
||||
{
|
||||
--
|
||||
1.9.3
|
||||
|
||||
Loading…
Reference in new issue