basctl/source/basicide/baside2b.cxx | 9 +++++++++
basctl/source/basicide/baside3.cxx | 16 +++++++++++++---
basctl/source/basicide/basidesh.cxx | 3 +++
ucb/source/ucp/webdav/webdavcontent.cxx | 4 ++++
vcl/aqua/source/app/vclnsapp.mm | 4 ++--
5 files changed, 31 insertions(+), 5 deletions(-)
New commits:
commit dba2d0e1e674ddb29c0d0552723c87fd676e041f
Author: Herbert Dürr <h...@apache.org>
Date: Wed Apr 17 11:55:50 2013 +0000
allow Mac port running with completely inactive AppleRemote
(cherry picked from commit ba037c7d3d5b79c9a5fd96671a86403dcf573128)
Change-Id: I3c81b33e62b56defc431f2a3e155718e2f64ba32
diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index 5a8ed35..e3e2518 100644
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -457,7 +457,7 @@
{
(void)pNotification;
SalData* pSalData = GetSalData();
- if (pSalData->mpMainController->remoteControl)
+ if( pSalData->mpMainController &&
pSalData->mpMainController->remoteControl)
{
// [remoteControl startListening: self];
// does crash because the right thing to do is
@@ -483,7 +483,7 @@
{
(void)pNotification;
SalData* pSalData = GetSalData();
- if (pSalData->mpMainController->remoteControl)
+ if( pSalData->mpMainController &&
pSalData->mpMainController->remoteControl)
{
// [remoteControl stopListening: self];
// does crash because the right thing to do is
commit 8eddae9bf703033668979423fc6d53e9c90adafb
Author: Ariel Constenla-Haile <arie...@apache.org>
Date: Sun Mar 24 12:22:04 2013 +0000
Resolves: #i121942# Explicitly set "ContentType" for non-DAV content
(cherry picked from commit 69f5a7496ce1d06ac312a753fa7b21f45db8fd78)
Change-Id: I86c3b321725923c03e1f44bf9d9ece9ed57aeaca
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx
b/ucb/source/ucp/webdav/webdavcontent.cxx
index 3f5691f..7ff158b 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -1530,6 +1530,10 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
OUString( "IsDocument" ),
uno::makeAny( true ),
true );
+ xProps->addProperty(
+ OUString( "ContentType" ),
+ uno::makeAny( OUString(WEBDAV_CONTENT_TYPE) ),
+ true );
}
}
else
commit cb01fc2eb0fa4728a4b7a404780cf7b04b16433b
Author: Ariel Constenla-Haile <arie...@apache.org>
Date: Sun Oct 7 10:47:35 2012 +0000
Related: #i108689# Invalidate Basic IDE slots to trigger feature update
(cherry picked from commit 060758a289c134548d8ad376eaca3d24ea84a0db)
Conflicts:
basctl/source/basicide/baside2b.cxx
basctl/source/basicide/baside3.cxx
Change-Id: I2bbe4eeae9b2e4d3ad257b26a6a9694deeaaa87c
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 7b7e3c7..f5f8c1d 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -424,7 +424,11 @@ void EditorWindow::MouseButtonUp( const MouseEvent &rEvt )
{
pEditView->MouseButtonUp( rEvt );
if (SfxBindings* pBindings = GetBindingsPtr())
+ {
+ pBindings->Invalidate( SID_COPY );
+ pBindings->Invalidate( SID_CUT );
pBindings->Invalidate( SID_BASICIDE_STAT_POS );
+ }
}
}
@@ -511,15 +515,20 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
{
if (SfxBindings* pBindings = GetBindingsPtr())
{
+ pBindings->Invalidate( SID_CUT );
+ pBindings->Invalidate( SID_COPY );
pBindings->Invalidate( SID_BASICIDE_STAT_POS );
+
if ( rKEvt.GetKeyCode().GetGroup() == KEYGROUP_CURSOR )
pBindings->Update( SID_BASICIDE_STAT_POS );
+
if ( !bWasModified && pEditEngine->IsModified() )
{
pBindings->Invalidate( SID_SAVEDOC );
pBindings->Invalidate( SID_DOC_MODIFIED );
pBindings->Invalidate( SID_UNDO );
}
+
if ( rKEvt.GetKeyCode().GetCode() == KEY_INSERT )
pBindings->Invalidate( SID_ATTR_INSERT );
}
diff --git a/basctl/source/basicide/baside3.cxx
b/basctl/source/basicide/baside3.cxx
index 25bb1ea..528e3ac 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -156,6 +156,8 @@ void DialogWindow::MouseButtonUp( const MouseEvent& rMEvt )
pBindings->Invalidate( SID_SHOW_PROPERTYBROWSER );
pBindings->Invalidate( SID_DOC_MODIFIED );
pBindings->Invalidate( SID_SAVEDOC );
+ pBindings->Invalidate( SID_COPY );
+ pBindings->Invalidate( SID_CUT );
}
}
@@ -170,6 +172,8 @@ void DialogWindow::MouseMove( const MouseEvent& rMEvt )
void DialogWindow::KeyInput( const KeyEvent& rKEvt )
{
+ SfxBindings* pBindings = GetBindingsPtr();
+
if( rKEvt.GetKeyCode() == KEY_BACKSPACE )
{
if (SfxDispatcher* pDispatcher = GetDispatcher())
@@ -177,9 +181,8 @@ void DialogWindow::KeyInput( const KeyEvent& rKEvt )
}
else
{
- if (rKEvt.GetKeyCode() == KEY_TAB)
- if (SfxBindings* pBindings = GetBindingsPtr())
- pBindings->Invalidate( SID_SHOW_PROPERTYBROWSER );
+ if( pBindings && rKEvt.GetKeyCode() == KEY_TAB )
+ pBindings->Invalidate( SID_SHOW_PROPERTYBROWSER );
if( !pEditor->KeyInput( rKEvt ) )
{
@@ -187,6 +190,13 @@ void DialogWindow::KeyInput( const KeyEvent& rKEvt )
Window::KeyInput( rKEvt );
}
}
+
+ // may be KEY_TAB, KEY_BACKSPACE, KEY_ESCAPE
+ if( pBindings )
+ {
+ pBindings->Invalidate( SID_COPY );
+ pBindings->Invalidate( SID_CUT );
+ }
}
void DialogWindow::Command( const CommandEvent& rCEvt )
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index fddf8bb..674775b 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -863,6 +863,9 @@ void Shell::InvalidateBasicIDESlots()
{
if (SfxBindings* pBindings = GetBindingsPtr())
{
+ pBindings->Invalidate( SID_COPY );
+ pBindings->Invalidate( SID_CUT );
+ pBindings->Invalidate( SID_PASTE );
pBindings->Invalidate( SID_UNDO );
pBindings->Invalidate( SID_REDO );
pBindings->Invalidate( SID_SAVEDOC );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
