[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source officecfg/registry postprocess/CustomTarget_registry.mk

[Gergo Mocsi]

 basctl/source/basicide/codecompleteoptionsdlg.cxx          |    8 ++++----
 officecfg/registry/data/org/openoffice/Office/BasicIDE.xcu |    4 ++--
 postprocess/CustomTarget_registry.mk                       |    2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit cbe6c15c676641a51c5504613eb939fec846e670
Author: Gergo Mocsi <gmocs...@gmail.com>
Date:   Tue Jul 30 14:48:57 2013 +0200

    GSOC work, config crach fix
    
    Storing code completition data in config file is fully functional.
    
    Change-Id: If9a974dd0ed052e26963ad5f202493674f1a51ca

diff --git a/basctl/source/basicide/codecompleteoptionsdlg.cxx 
b/basctl/source/basicide/codecompleteoptionsdlg.cxx
index aa887a2..130f361 100644
--- a/basctl/source/basicide/codecompleteoptionsdlg.cxx
+++ b/basctl/source/basicide/codecompleteoptionsdlg.cxx
@@ -42,13 +42,13 @@ CodeCompleteOptionsDlg::CodeCompleteOptionsDlg( Window* 
pWindow )
 
     pOkBtn->SetClickHdl( LINK( this, CodeCompleteOptionsDlg, OkHdl ) );
     pCancelBtn->SetClickHdl( LINK( this, CodeCompleteOptionsDlg, CancelHdl ) );
-    //LoadConfig();
+    LoadConfig();
 
-    pCodeCompleteChk->Check( CodeCompleteOptions::IsCodeCompleteOn() );
+    /*pCodeCompleteChk->Check( CodeCompleteOptions::IsCodeCompleteOn() );
     pAutocloseProcChk->Check( CodeCompleteOptions::IsProcedureAutoCompleteOn() 
);
     pAutocloseQuotesChk->Check( CodeCompleteOptions::IsAutoCloseQuotesOn() );
     pAutocloseParenChk->Check( CodeCompleteOptions::IsAutoCloseParenthesisOn() 
);
-    pAutoCorrectSpellingChk->Check( 
CodeCompleteOptions::IsAutoCorrectSpellingOn() );
+    pAutoCorrectSpellingChk->Check( 
CodeCompleteOptions::IsAutoCorrectSpellingOn() );*/
 
 }
 
@@ -64,7 +64,7 @@ IMPL_LINK_NOARG(CodeCompleteOptionsDlg, OkHdl)
     CodeCompleteOptions::SetAutoCloseParenthesisOn( 
pAutocloseParenChk->IsChecked() );
     CodeCompleteOptions::SetAutoCorrectSpellingOn( 
pAutoCorrectSpellingChk->IsChecked() );
 
-    //SaveConfig();
+    SaveConfig();
     Close();
     return 0;
 }
diff --git a/officecfg/registry/data/org/openoffice/Office/BasicIDE.xcu 
b/officecfg/registry/data/org/openoffice/Office/BasicIDE.xcu
index 283d804..d3f7498 100644
--- a/officecfg/registry/data/org/openoffice/Office/BasicIDE.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/BasicIDE.xcu
@@ -18,7 +18,7 @@
  -->
  <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
 <oor:component-data xmlns:oor="http://openoffice.org/2001/registry"; 
xmlns:xs="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:install="http://openoffice.org/2004/installation"; oor:name="BasicIDE" 
oor:package="org.openoffice.Office">
-    <node oor:name="Autocomplete" oor:op="replace">
+    <!--<node oor:name="Autocomplete" oor:op="replace">
         <prop oor:name="CodeComplete">
             <value>false</value>
         </prop>
@@ -34,5 +34,5 @@
         <prop oor:name="AutoCorrectSpelling">
             <value>false</value>
         </prop>
-    </node>
+    </node>!-->
 </oor:component-data>
diff --git a/postprocess/CustomTarget_registry.mk 
b/postprocess/CustomTarget_registry.mk
index fa2b139..1743e51 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -137,6 +137,7 @@ postprocess_FILES_main := \
        $(postprocess_XCS)/LDAP.xcs \
        $(postprocess_XCS)/Office/Accelerators.xcs \
        $(postprocess_XCS)/Office/Addons.xcs \
+       $(postprocess_XCS)/Office/BasicIDE.xcs \
        $(postprocess_XCS)/Office/Calc.xcs \
        $(postprocess_XCS)/Office/CalcAddIns.xcs \
        $(postprocess_XCS)/Office/Canvas.xcs \
@@ -221,6 +222,7 @@ postprocess_FILES_main := \
        $(postprocess_XCU)/Inet.xcu \
        $(postprocess_XCU)/Interaction.xcu \
        $(postprocess_XCU)/Office/Accelerators.xcu \
+       $(postprocess_XCU)/Office/BasicIDE.xcu \
        $(postprocess_XCU)/Office/Calc.xcu \
        $(postprocess_XCU)/Office/Canvas.xcu \
        $(postprocess_XCU)/Office/Common.xcu \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits