incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1207270 - in /incubator/ooo/trunk/main: lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx postprocess/packcomponents/makefile.mk scp2/source/ooo/file_library_ooo.scp
Date Mon, 28 Nov 2011 15:03:40 GMT
Author: jsc
Date: Mon Nov 28 15:03:39 2011
New Revision: 1207270

URL: http://svn.apache.org/viewvc?rev=1207270&view=rev
Log:
118628: minor changes to make the spellchecker working on MacOS, fix compile errors and dependency
to hunspell, thanks arielch for a patch

Modified:
    incubator/ooo/trunk/main/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
    incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
    incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp

Modified: incubator/ooo/trunk/main/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx?rev=1207270&r1=1207269&r2=1207270&view=diff
==============================================================================
--- incubator/ooo/trunk/main/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
(original)
+++ incubator/ooo/trunk/main/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
Mon Nov 28 15:03:39 2011
@@ -52,7 +52,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::linguistic2;
 using namespace linguistic;
 
-
 MacSpellChecker::MacSpellChecker() :
 	aEvtListeners	( GetLinguMutex() )
 {
@@ -110,14 +109,15 @@ Sequence< Locale > SAL_CALL MacSpellChec
 
         int numusr;          // number of user dictionary entries
         int numshr;          // number of shared dictionary entries
-        dictentry * spdict;  // shared dict entry pointer
-        dictentry * updict;  // user dict entry pointer
+        // dictentry * spdict;  // shared dict entry pointer
+        // dictentry * updict;  // user dict entry pointer
         SvtPathOptions aPathOpt;
 		rtl_TextEncoding aEnc = RTL_TEXTENCODING_UTF8;
 
     	std::vector<objc_object *> postspdict;
+        std::vector<objc_object *> postupdict;
     	//std::vector<dictentry *> postspdict;
-        std::vector<dictentry *> postupdict;
+        //std::vector<dictentry *> postupdict;
 
 
 	if (!numdict) {
@@ -199,8 +199,8 @@ Sequence< Locale > SAL_CALL MacSpellChec
             }
 
             /* de-allocation of memory is handled inside the DictMgr */
-            updict = NULL;
-            spdict = NULL;
+            // updict = NULL;
+            // spdict = NULL;
 
         }
 

Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1207270&r1=1207269&r2=1207270&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Mon Nov 28 15:03:39 2011
@@ -297,15 +297,10 @@ my_components += \
     avmediaQuickTime \
     fps_aqua \
     macab1 \
-    macbe1
-
-.IF "$(DISABLE_HUNSPELL)" == ""
-my_components += \
+    macbe1 \
     MacOSXSpell
 .END
 
-.END
-
 .IF "$(OS)" == "WNT"
 my_components += \
     ado \

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1207270&r1=1207269&r2=1207270&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Mon Nov 28 15:03:39 2011
@@ -541,14 +541,12 @@ File gid_File_Lib_Fps_Aqua
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
 End
 
-#ifndef DISABLE_HUNSPELL
 File gid_File_Lib_MacOSXSpell
 	TXT_FILE_BODY;
 	Styles = (PACKED);
 	Name = LIBNAME(MacOSXSpell);
 	Dir = SCP2_OOO_BIN_DIR;
 End
-#endif
 
 File gid_File_Lib_avmediaQuickTime
 	TXT_FILE_BODY;



Mime
View raw message