cui/source/inc/postdlg.hxx | 2 +-
cui/uiconfig/ui/comment.ui | 2 +-
include/sfx2/objsh.hxx | 3 +++
sfx2/source/doc/objstor.cxx | 4 ++++
sw/source/core/layout/paintfrm.cxx | 13 +++++++++++++
5 files changed, 22 insertions(+), 2 deletions(-)
New commits:
commit 9ac296af1d3d659097153884e3b78a57b334c4a2
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri May 31 16:50:00 2013 +0100
Resolves: fdo#65215 wrong type for the multiline comment edit widget
Change-Id: I14b13285daf27191bb8cf95bc7e801281f97dde8
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 592db0d..4ae9b7d 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -89,7 +89,7 @@ public:
private:
FixedText* m_pLastEditFT;
- MultiLineEdit* m_pEditED;
+ VclMultiLineEdit* m_pEditED;
VclContainer* m_pInsertAuthor;
PushButton* m_pAuthorBtn;
diff --git a/cui/uiconfig/ui/comment.ui b/cui/uiconfig/ui/comment.ui
index 5959b4a..928bb25 100644
--- a/cui/uiconfig/ui/comment.ui
+++ b/cui/uiconfig/ui/comment.ui
@@ -184,7 +184,7 @@
<property name="xalign">0</property>
<property name="label"
translatable="yes">_Text</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">edit</property>
+ <property name="mnemonic_widget">edit:border</property>
</object>
<packing>
<property name="expand">False</property>
commit 61dfc6fa942e9d9c241231fb5467c860fe95ea06
Author: Jürgen Schmidt <j...@apache.org>
Date: Fri Jun 22 12:30:43 2012 +0000
Resolves: #i120030# optimize thumbnail creation/painting
(cherry picked from commit 255beb8f56a074ce85eaf1db3cdf168f9c09466e)
Conflicts:
sfx2/inc/sfx2/objsh.hxx
sw/source/core/layout/paintfrm.cxx
Change-Id: I23157f7a6983ba81b1c8ddcc409a4989915be2ed
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 4c366a5..4ace180 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -198,6 +198,7 @@ private:
sal_Bool bHasName :1, // sal_True := existing
object,
// sal_False := new object
bIsTmp :1; // temporary Storage
+ sal_Bool bIsInGenerateThumbnail; //optimize thumbnail
generate and store procedure to improve odt saving performance, i120030
private:
SAL_DLLPRIVATE void UpdateTime_Impl(const ::com::sun::star::uno::Reference<
@@ -444,6 +445,8 @@ public:
sal_Bool bIsTemplate,
const ::com::sun::star::uno::Reference<
::com::sun::star::io::XStream >& xStream );
+ sal_Bool IsInGenerateAndStoreThumbnail() const {return
bIsInGenerateThumbnail;}//optimize thumbnail generate and store procedure to
improve odt saving performance, i120030
+
// Transfer IFace
void AbortImport();
sal_Bool IsAbortingImport() const;
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index c57c79a..902b538 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -3523,6 +3523,8 @@ sal_Bool SfxObjectShell::GenerateAndStoreThumbnail(
sal_Bool bEncrypted,
{
RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mv76033)
SfxObjectShell::GenerateAndStoreThumbnail" );
+ bIsInGenerateThumbnail = sal_True;//optimize thumbnail generate and store
procedure to improve odt saving performance, i120030
+
sal_Bool bResult = sal_False;
try {
@@ -3547,6 +3549,8 @@ sal_Bool SfxObjectShell::GenerateAndStoreThumbnail(
sal_Bool bEncrypted,
{
}
+ bIsInGenerateThumbnail = sal_False;//optimize thumbnail generate and store
procedure to improve odt saving performance, i120030
+
return bResult;
}
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 615d7d8..cb75b9e 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3880,6 +3880,19 @@ private:
void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
{
+ //optimize thumbnail generation and store procedure to improve odt saving
performance, #i120030#
+ ViewShell *pShell = getRootFrm()->GetCurrShell();
+ if (pShell && pShell->GetDoc() && pShell->GetDoc()->GetDocShell())
+ {
+ sal_Bool bInGenerateThumbnail =
pShell->GetDoc()->GetDocShell()->IsInGenerateAndStoreThumbnail();
+ if (bInGenerateThumbnail)
+ {
+ SwRect aVisRect = pShell->VisArea();
+ if (!aVisRect.IsOver(Frm()))
+ return;
+ }
+ }
+
//because of the overlapping of frames and drawing objects the flys have to
//paint their borders (and those of the internal ones) directly.
//e.g. #33066#
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
