diff options
| author | Gergo Mocsi <gmocsi91@gmail.com> | 2013-07-30 14:48:57 +0200 |
|---|---|---|
| committer | Gergo Mocsi <gmocsi91@gmail.com> | 2013-09-02 18:16:53 +0200 |
| commit | c40ba9c3e041a5b94bcbc2be7aa49a1c7df6a188 (patch) | |
| tree | cda2734989f486af6c594fe8fca6c87c0ab3924b | |
| parent | 8194798645517e7c54296ba47ded09a67cf71805 (diff) | |
GSOC work, config crach fix
Storing code completition data in config file is fully functional.
Change-Id: If9a974dd0ed052e26963ad5f202493674f1a51ca
| -rw-r--r-- | basctl/source/basicide/codecompleteoptionsdlg.cxx | 8 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/BasicIDE.xcu | 4 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/basctl/source/basicide/codecompleteoptionsdlg.cxx b/basctl/source/basicide/codecompleteoptionsdlg.cxx index aa887a235440..130f3617715c 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 283d8043da90..d3f74988aa94 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 cab1be8417eb..ec5961187c15 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -128,6 +128,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 \ @@ -211,6 +212,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 \ |