[Libreoffice-commits] core.git: 3 commits - clucene/patches sd/source setup_native/Module_setup_native.mk

[Jan Holesovsky]

 clucene/patches/clucene-narrowing-conversions.patch |   11 +++++++++++
 sd/source/ui/remotecontrol/BluetoothServer.cxx      |    1 -
 sd/source/ui/remotecontrol/BluetoothServer.hxx      |    2 ++
 setup_native/Module_setup_native.mk                 |    2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 8eeb0acb445641bfcad5066ed0561c35d7c1c2f7
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Mar 1 10:52:19 2013 +0100

    MinGW: Make mpImpl available only on Linux.
    
    Change-Id: I35c3ccab01e4607510bd67628f4dfa94633aa8d7

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 926e4b2..0c6b208 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -593,7 +593,6 @@ BluetoothServer::BluetoothServer( std::vector<Communicator*>* pCommunicators )
 #ifdef LINUX_BLUETOOTH
     mpImpl.reset(new BluetoothServerImpl());
 #endif
-    (void) mpImpl; // Avoid warning: private field 'mpImpl' is not used
 }
 
 BluetoothServer::~BluetoothServer()
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.hxx b/sd/source/ui/remotecontrol/BluetoothServer.hxx
index bfaeccc..756129a 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.hxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.hxx
@@ -42,7 +42,9 @@ namespace sd
         enum { UNKNOWN, DISCOVERABLE, NOT_DISCOVERABLE } meWasDiscoverable;
         static BluetoothServer *spServer;
 
+#ifdef LINUX_BLUETOOTH
         boost::scoped_ptr<BluetoothServerImpl> mpImpl;
+#endif
         virtual void SAL_CALL run();
 
         void cleanupCommunicators();
commit 20c1d70fa5c87356bd95b8ac34ae12b8da31ab58
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Mar 1 09:27:02 2013 +0100

    MinGW: Workaround narrowing conversion in clucene.
    
    Change-Id: I921d8140ecdf577687571a9aeca3100023f390d4

diff --git a/clucene/patches/clucene-narrowing-conversions.patch b/clucene/patches/clucene-narrowing-conversions.patch
index f0e971c..64065ac 100644
--- a/clucene/patches/clucene-narrowing-conversions.patch
+++ b/clucene/patches/clucene-narrowing-conversions.patch
@@ -23,3 +23,14 @@
  };
  const int32_t QueryParserTokenManager::jjnextStates[]={
  		15, 17, 18, 29, 32, 23, 33, 30, 20, 21, 32, 23, 33, 31, 34, 27,
+--- src/core/CLucene/queryParser/legacy/Lexer.cpp.sav	2013-03-01 09:25:18.000000000 +0100
++++ src/core/CLucene/queryParser/legacy/Lexer.cpp 09:25:12.000000000 +0100
+@@ -117,7 +117,7 @@ bool Lexer::GetNextToken(QueryToken* tok
+       if( _istspace(ch)!=0 ) {
+          continue;
+       }
+-      TCHAR buf[2] = {ch,'\0'};
++      TCHAR buf[2] = {TCHAR(ch),'\0'};
+       switch(ch) {
+          case '+':
+             token->set(buf, QueryToken::PLUS);
commit 52efa22867b6201a3d97180bfb76e4c780e923a2
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Mar 1 09:14:11 2013 +0100

    MinGW: Actually, this is usable only with MSVC.
    
    Change-Id: Ida4715033f45f4857c8355b40878f9b05362a222

diff --git a/setup_native/Module_setup_native.mk b/setup_native/Module_setup_native.mk
index 966dc60..4070657 100644
--- a/setup_native/Module_setup_native.mk
+++ b/setup_native/Module_setup_native.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Module_add_targets,setup_native,\
 ))
 endif
 
-ifeq ($(OS),WNT)
+ifeq ($(OS)$(COM),WNTMSC)
 $(eval $(call gb_Module_add_targets,setup_native,\
         Library_instooofiltmsi \
 	Library_jfregca \