[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sd/source
sd/source/ui/animations/CustomAnimationDialog.cxx | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
New commits:
commit 7eb5815354a2ba9a02b66c61a1eb3c58c4c0e534
Author: Zhe Wang wangz...@apache.org
Date: Mon Jun 25 05:04:59 2012 +
for #120049#(cherry picked from commit
9b4e6064f9598c834a9c36c39932f3e326419d44)
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 64dc36c..d356078 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -2325,15 +2325,20 @@ void CustomAnimationTextAnimTabPage::update(
STLPropertySet* pSet )
pSet-setPropertyValue( nHandleTextGroupingAuto, makeAny(
fTextGroupingAuto ) );
}
}
+//bug 120049
+//[crash] Aoo crash when modify the Random effects animation effect's
trigger condition to Start effect on click of .
+//If this control is disabled, we should ignore its value
+if (maCBXAnimateForm.IsEnabled())
+{
+sal_Bool bAnimateForm = maCBXAnimateForm.IsChecked();
+sal_Bool bOldAnimateForm = !bAnimateForm;
-sal_Bool bAnimateForm = maCBXAnimateForm.IsChecked();
-sal_Bool bOldAnimateForm = !bAnimateForm;
-
-if(mpSet-getPropertyState( nHandleAnimateForm ) !=
STLPropertyState_AMBIGUOUS)
-mpSet-getPropertyValue( nHandleAnimateForm ) = bOldAnimateForm;
+if(mpSet-getPropertyState( nHandleAnimateForm ) !=
STLPropertyState_AMBIGUOUS)
+mpSet-getPropertyValue( nHandleAnimateForm ) = bOldAnimateForm;
-if( bAnimateForm != bOldAnimateForm )
-pSet-setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm ) );
+if( bAnimateForm != bOldAnimateForm )
+pSet-setPropertyValue( nHandleAnimateForm, makeAny( bAnimateForm
) );
+}
}
void CustomAnimationTextAnimTabPage::updateControlStates()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sd/source
sd/source/core/sdpage.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5451b7bd30fba75f216f38ba1a1c7c144fd3fa7e
Author: Joren De Cuyper joren.libreoff...@telenet.be
Date: Sun Mar 24 20:37:43 2013 +0100
fdo#60462 - Small errors in the layout margins of the text boxes
As you can see on this screenshot
https://bugs.freedesktop.org/attachment.cgi?id=74399 there was a margin
problem. The X-position of the text box is at 0.05, but the
width was only 0.88 so we had 0.02 _extra_ on the right side. This is the
width of that little margin error. Fixing it by setting Layoutsize width
to 0.90, so we have on both side a nice 0.05 margin.
Change-Id: Id712ce3695a760c8f955413c9392c008733d7fb9
Reviewed-on: https://gerrit.libreoffice.org/2972
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index ecc38f4..602fd58 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1054,7 +1054,7 @@ Rectangle SdPage::GetLayoutRect() const
{
aLayoutPos.X() += long( aLayoutSize.Width() * 0.05 );
aLayoutPos.Y() += long( aLayoutSize.Height() * 0.234 );
-aLayoutSize.Width() = long( aLayoutSize.Width() * 0.88 );
+aLayoutSize.Width() = long( aLayoutSize.Width() * 0.9 );
aLayoutSize.Height() = long( aLayoutSize.Height() * 0.58 );
aLayoutRect.SetPos(aLayoutPos);
aLayoutRect.SetSize(aLayoutSize);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sd/source sw/source
sd/source/ui/annotations/annotationwindow.cxx |5 + sw/source/ui/docvw/SidebarWin.cxx |5 + 2 files changed, 2 insertions(+), 8 deletions(-) New commits: commit d91b5e739128cd8f4c3ef86c17cd723d5b292a2d Author: navin patidar pati...@kacst.edu.sa Date: Tue Mar 19 08:58:22 2013 +0300 fix fdo#62050 : Initially disable RTL for comment window. In RTL UI, comment window is RTL and editboxâs (editeng) default writing direction is LTR. and i suspect, the bug is result of this RTL LTR mix-up. Change-Id: If3af4ae428b67151d1907b9e60a97049e0e6 Reviewed-on: https://gerrit.libreoffice.org/2831 Reviewed-by: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa (cherry picked from commit 79dd315e9b19ec3bc6601c359a0ecb6d576d4aa8) Signed-off-by: Lior Kaplan kaplanl...@gmail.com fix fdo#62050: for impress Impress is also affected by fdo#62050. In RTL UI, comment window is RTL and editboxâs (editeng) default writing direction is LTR. I suspect, bug is result of this RTL LTR mix-up. Change-Id: I188ce05350f721081378509915158d4ec4e5f8cf Reviewed-on: https://gerrit.libreoffice.org/2922 Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa (cherry picked from commit 092bf2fb0052ca73855127dc03ff1ae3f9321506) Signed-off-by: Lior Kaplan kaplanl...@gmail.com diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index d217cbf..6573ea0 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -327,15 +327,12 @@ void AnnotationWindow::InitControls() mpOutliner-SetRefDevice( pDev ); } +mpTextWindow-EnableRTL( sal_False ); mpOutlinerView = new OutlinerView ( mpOutliner, mpTextWindow ); mpOutliner-InsertView(mpOutlinerView ); mpTextWindow-SetOutlinerView(mpOutlinerView); mpOutlinerView-SetOutputArea( PixelToLogic( Rectangle(0,0,1,1) ) ); -// TODO: ?? -EEHorizontalTextDirection aDefHoriTextDir = Application::GetSettings().GetLayoutRTL() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R; -mpOutliner-SetDefaultHorizontalTextDirection( aDefHoriTextDir ); - //create Scrollbars mpVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG); mpVScrollbar-EnableNativeWidget(false); diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index 8ad2c15..c0417ad 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -320,6 +320,7 @@ void SwSidebarWin::InitControls() mpOutliner-SetUpdateMode( sal_True ); Rescale(); +mpSidebarTxtControl-EnableRTL( sal_False ); mpOutlinerView = new OutlinerView ( mpOutliner, mpSidebarTxtControl ); mpOutlinerView-SetBackgroundColor(COL_TRANSPARENT); mpOutliner-InsertView(mpOutlinerView ); @@ -327,10 +328,6 @@ void SwSidebarWin::InitControls() mpOutlinerView-SetAttribs(DefaultItem()); -// TODO: ?? -EEHorizontalTextDirection aDefHoriTextDir = Application::GetSettings().GetLayoutRTL() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R; -mpOutliner-SetDefaultHorizontalTextDirection( aDefHoriTextDir ); - //create Scrollbars mpVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG); mpVScrollbar-EnableNativeWidget(false); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sd/source
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 216257e8777c5cd2fe2ef68bfa6a1a953eb923be Author: Tor Lillqvist t...@iki.fi Date: Tue Feb 19 19:57:12 2013 +0200 Avoid infinite recursion (cherry picked from commit 0d05957cf0c38abab45030ba172025e4ef318f43) Change-Id: I99d26f9601ceed98d0357d8722f8cf91cf007d29 Reviewed-on: https://gerrit.libreoffice.org/2268 Reviewed-by: Eike Rathke er...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx index e2c7a4a..dcec4e3 100644 --- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx +++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx @@ -67,7 +67,7 @@ void BufferedStreamSocket::close() mSocket = -1; } else -close(); +::osl::StreamSocket::close(); } sal_Int32 BufferedStreamSocket::readLine( OString aLine ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sd/source
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |6 +++---
sd/source/ui/remotecontrol/Receiver.cxx |3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit e818eedacaddad52c83d3102df8f1183a675697c
Author: Thorsten Behrens tbehr...@suse.com
Date: Tue Feb 19 12:18:12 2013 +0100
Fix crashes in sdremote after suspend/resume cycles.
Change-Id: I0f64820887919386f266290ae8b7c53f8a0a5458
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index c4f7f611..71fec17 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -73,7 +73,7 @@ sal_Int32 BufferedStreamSocket::readLine( OString aLine )
// Process buffer first incase data already present.
vectorchar::iterator aIt;
if ( (aIt = find( aBuffer.begin(), aBuffer.end(), '\n' ))
-!= aBuffer.end() )
+ != aBuffer.end() )
{
sal_uInt64 aLocation = aIt - aBuffer.begin();
@@ -92,9 +92,9 @@ sal_Int32 BufferedStreamSocket::readLine( OString aLine )
else
aRet = ::recv( mSocket, aBuffer[aRead], 100, 0 );
-if ( aRet == 0 )
+if ( aRet = 0 )
{
-return aRet;
+return 0;
}
// Prevent buffer from growing massively large.
if ( aRead MAX_LINE_LENGTH )
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx
b/sd/source/ui/remotecontrol/Receiver.cxx
index c3e7d8a..eaa2c6e 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -51,7 +51,8 @@ void Receiver::Timeout()
{
std::vector rtl::OString aCommands( maExecQueue.front() );
maExecQueue.pop_front();
-executeCommand( aCommands );
+if( !aCommands.empty() )
+executeCommand( aCommands );
Start();
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sd/source
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit bf357749bee218b59b08d4e3e467f89c27ff
Author: Tor Lillqvist t...@iki.fi
Date: Tue Feb 19 18:25:06 2013 +0200
Surely we want closesocket() on Windows
(cherry picked from commit 49db90342f193f31500b2717cc27bdf2f25e2d95)
Change-Id: I13d5715248612c9b1b50314d72f5eca202debd04
Reviewed-on: https://gerrit.libreoffice.org/2262
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
index 71fec17..e2c7a4a 100644
--- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
+++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx
@@ -59,7 +59,11 @@ void BufferedStreamSocket::close()
{
if( usingCSocket )
{
+#ifdef WIN32
+::closesocket( mSocket );
+#else
::close( mSocket );
+#endif
mSocket = -1;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |8 1 file changed, 8 insertions(+) New commits: commit ecfe412f7758c1ab3d3f2a784c7d0356585529e5 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Thu Feb 14 18:23:49 2013 +0100 fix build Caused by 185e1be6cd1954b8cc5a302c879384f2549cd060, fix is more or less d0d07cd2975c1fb783d0f8591dd3a4931d1c5be5. Change-Id: Ia7d228139126b3e60370b85c106bc970f4e68cce Signed-off-by: Kohei Yoshida kohei.yosh...@gmail.com diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 9912614..0a5e1d0 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -34,7 +34,15 @@ #undef WB_LEFT #undef WB_RIGHT #include winsock2.h + // HACK: ws2bth.h defines a struct with a field named MSC, which is + // a #define set by gbuild. Plain #undef MSC here fails with MSVC + // used together with ccache (bug, presumably), so #define it to some + // other usable value. + #undef MSC + #define MSC mscfield #include ws2bth.h + #undef MSC + #define MSC #endif #ifdef __MINGW32__ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
