diff options
| author | Gergo Mocsi <gmocsi91@gmail.com> | 2013-08-01 13:59:10 +0200 |
|---|---|---|
| committer | Gergo Mocsi <gmocsi91@gmail.com> | 2013-09-02 18:16:54 +0200 |
| commit | 790a7aff12eb37c76484026bd77915cef3de98d4 (patch) | |
| tree | 622ffe4fdd47e4e13e272d244a8754828eda0d02 /basic/source/classes/codecompletecache.cxx | |
| parent | GSOC work, autoclose procedures fix (diff) | |
| download | core-790a7aff12eb37c76484026bd77915cef3de98d4.tar.gz core-790a7aff12eb37c76484026bd77915cef3de98d4.zip | |
GSOC work, renaming for consistency
Menu enrty was renamed to IDE Options under View.
SID_BASICIDE_CODECOMPLETE was renamed to SID_BASICIDE_IDEOPTIONS.
CodeCompleteDlg was rename to BasicIDEOptionDlg.
Ui file was renamed to basicideoptionsdialog.ui.
Checkbox for extended types is now independent from code complete one.
Change-Id: Id862df0ee56cdf2aa81e19a34099fe679ad5d311
Diffstat (limited to 'basic/source/classes/codecompletecache.cxx')
| -rw-r--r-- | basic/source/classes/codecompletecache.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/basic/source/classes/codecompletecache.cxx b/basic/source/classes/codecompletecache.cxx index 57239ccc01f3..172954331cf4 100644 --- a/basic/source/classes/codecompletecache.cxx +++ b/basic/source/classes/codecompletecache.cxx @@ -28,17 +28,13 @@ namespace } CodeCompleteOptions::CodeCompleteOptions() -/*: bIsCodeCompleteOn( false ), -bIsProcedureAutoCompleteOn( false ), -bIsAutoCloseQuotesOn( false ), -bIsAutoCloseParenthesisOn( false ), -bIsAutoCorrectSpellingOn( false )*/ { - bIsAutoCorrectSpellingOn = officecfg::Office::BasicIDE::Autocomplete::AutoCorrectSpelling::get(); + bIsAutoCorrectKeywordsOn = officecfg::Office::BasicIDE::Autocomplete::AutoCorrectKeywords::get(); bIsAutoCloseParenthesisOn = officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::get(); bIsAutoCloseQuotesOn = officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::get(); bIsProcedureAutoCompleteOn = officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::get(); bIsCodeCompleteOn = officecfg::Office::BasicIDE::Autocomplete::CodeComplete::get(); + bExtendedTypeDeclarationOn = officecfg::Office::BasicIDE::Autocomplete::UseExtended::get(); } bool CodeCompleteOptions::IsCodeCompleteOn() @@ -53,12 +49,12 @@ void CodeCompleteOptions::SetCodeCompleteOn( const bool& b ) bool CodeCompleteOptions::IsExtendedTypeDeclaration() { - return CodeCompleteOptions::IsCodeCompleteOn(); + return theCodeCompleteOptions::get().aMiscOptions.IsExperimentalMode() && theCodeCompleteOptions::get().bExtendedTypeDeclarationOn; } void CodeCompleteOptions::SetExtendedTypeDeclaration( const bool& b ) { - CodeCompleteOptions::SetCodeCompleteOn( b ); + theCodeCompleteOptions::get().bExtendedTypeDeclarationOn = b; } bool CodeCompleteOptions::IsProcedureAutoCompleteOn() @@ -91,14 +87,14 @@ void CodeCompleteOptions::SetAutoCloseParenthesisOn( const bool& b ) theCodeCompleteOptions::get().bIsAutoCloseParenthesisOn = b; } -bool CodeCompleteOptions::IsAutoCorrectSpellingOn() +bool CodeCompleteOptions::IsAutoCorrectKeywordsOn() { - return theCodeCompleteOptions::get().aMiscOptions.IsExperimentalMode() && theCodeCompleteOptions::get().bIsAutoCorrectSpellingOn; + return theCodeCompleteOptions::get().aMiscOptions.IsExperimentalMode() && theCodeCompleteOptions::get().bIsAutoCorrectKeywordsOn; } -void CodeCompleteOptions::SetAutoCorrectSpellingOn( const bool& b ) +void CodeCompleteOptions::SetAutoCorrectKeywordsOn( const bool& b ) { - theCodeCompleteOptions::get().bIsAutoCorrectSpellingOn = b; + theCodeCompleteOptions::get().bIsAutoCorrectKeywordsOn = b; } std::ostream& operator<< (std::ostream& aStream, const CodeCompleteDataCache& aCache) |