[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.5-1-257-ge20f91f

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-4.0 branch:
commit 0ecd73d137ff47a2efe52465492c7f8d4ed5ee8b
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Feb 6 22:34:57 2013 +0100

    fix sdremote when bluetooth isn't enabled (like on kFreeBSD)

diff --git a/patches/sdremote-close-on-non-bluetooth.diff b/patches/sdremote-close-on-non-bluetooth.diff
new file mode 100644
index 0000000..e1e3fff
--- /dev/null
+++ b/patches/sdremote-close-on-non-bluetooth.diff
@@ -0,0 +1,42 @@
+diff -u b/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
+--- b/sd/source/ui/dlg/RemoteDialog.cxx
++++ b/sd/source/ui/dlg/RemoteDialog.cxx
+@@ -25,9 +25,12 @@
+     mClientBox(         this, NULL, SdResId( LB_SERVERS ) ),
+     mPreviouslyDiscoverable()
+ {
+-#ifdef ENABLE_SDREMOTE
++    (void) mPreviouslyDiscoverable; // avoid warnings about unused member
++
+     FreeResource();
+ 
++#ifdef ENABLE_SDREMOTE
++
+ #ifdef ENABLE_SDREMOTE_BLUETOOTH
+     mPreviouslyDiscoverable = RemoteServer::isBluetoothDiscoverable();
+     if ( !mPreviouslyDiscoverable )
+@@ -43,13 +46,11 @@
+     {
+         mClientBox.addEntry( *aIt );
+     }
++#endif
+ 
+     mButtonConnect.SetClickHdl( LINK( this, RemoteDialog, HandleConnectButton ) );
+     SetCloseHdl( LINK( this, RemoteDialog, CloseHdl ) );
+     mButtonCancel.SetClickHdl( LINK( this, RemoteDialog, CloseHdl ) );
+-#else
+-    (void) mPreviouslyDiscoverable; // avoid warnings about unused member
+-#endif
+ }
+ 
+ RemoteDialog::~RemoteDialog()
+@@ -84,8 +85,8 @@
+     {
+         RemoteServer::setBluetoothDiscoverable( false );
+     }
+-    Close();
+ #endif
++    Close();
+     return 0;
+ }
+ 
diff --git a/patches/series b/patches/series
index 874b44c..8dfed33 100644
--- a/patches/series
+++ b/patches/series
@@ -26,3 +26,4 @@ ignore-sc_cellrangesbase-fails.diff
 build-dont-run-checks.diff
 disable-flaky-unoapi-tests.diff
 dont-touch-urd.diff
+sdremote-close-on-non-bluetooth.diff

-- 
LibreOffice packaging repository