[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sfx2/source

[Tor Lillqvist]

 sfx2/source/view/viewsh.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 6bc38d2758c3535ed32bfe0bd2a475b7938f6fc1
Author: Tor Lillqvist t...@collabora.com
Date:   Sun Sep 21 14:49:11 2014 +0300

Disable the email sending menu entries when sandboxed on OS X

The way we send email doesn't work anyway in a sandboxed app on OS X
anyway. If we want to offer the functionality, we need to implement it
in an OS X -specific way, perhaps using the Scripting Target
functionality of Mail.app.

What we need, to be really native in this regards on OS X, would be
to have a share functionality that would in addition to sharing
through email offer AirDrop, Facebook, Twitter etc. Like Apple's own
apps. Quite possibly there are system APIs that automate much of
that. But they probably require your app to be more native in other
ways, too, like using NSDocument etc. Later...

Change-Id: Id1424377b7d493d4ec696f3242dae55a2a67dfc7

diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 6950670..3b29c1b 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include config_features.h
+
 #include svl/stritem.hxx
 #include svl/eitem.hxx
 #include svl/whiter.hxx
@@ -789,6 +791,16 @@ void SfxViewShell::GetState_Impl( SfxItemSet rSet )
 {
 switch ( nSID )
 {
+#if HAVE_FEATURE_MACOSX_SANDBOX
+case SID_BLUETOOTH_SENDDOC:
+case SID_MAIL_SENDDOC:
+case SID_MAIL_SENDDOCASFORMAT:
+case SID_MAIL_SENDDOCASMS:
+case SID_MAIL_SENDDOCASOOO:
+case SID_MAIL_SENDDOCASPDF:
+rSet.DisableItem(nSID);
+break;
+#endif
 // Printer functions
 case SID_PRINTDOC:
 case SID_PRINTDOCDIRECT:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sfx2/source

[Stephan Bergmann]

 sfx2/source/doc/docmacromode.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c126f210bb62143eea6263e37dedcb2fba24cade
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 20 14:55:40 2014 +0200

Use varying aElement name

Change-Id: Idc135ef5031a01961cc18d897a734b598bc833f4

diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 7082bc4..00efbfb 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -342,7 +342,7 @@ namespace sfx2
 if( aElement == aStdLibName || aElement == 
aVBAProject )
 {
 Reference  XNameAccess  xLib;
-Any aAny = xContainer-getByName( aStdLibName 
);
+Any aAny = xContainer-getByName( aElement );
 aAny = xLib;
 if ( xLib.is()  xLib-hasElements() )
 return sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits