Skip to content

Commit

Permalink
Unconditionally enable grammar checker
Browse files Browse the repository at this point in the history
It is only used with languages and dictionaries where support
is available.
  • Loading branch information
hatapitk committed Aug 22, 2014
1 parent 10d58ff commit 2f6e3b5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 14 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
@@ -1,3 +1,7 @@
2014-08-22 Harri Pitkänen <hatapitk@iki.fi>
* Unconditionally enable grammar checker since it is now
used only with dictionaries and backends that support it.

2014-08-19 Harri Pitkänen <hatapitk@iki.fi>
* Switch to passive component registration.

Expand Down
10 changes: 0 additions & 10 deletions Makefile
Expand Up @@ -48,9 +48,6 @@ VOIKKO_DEBUG=NO
# of this extension, uncomment the following.
# SHOW_LICENSE=1

# If you want to enable the grammar checker, set this option to 1
ENABLE_GRAMMAR_CHECKER=1

# Setting this option to 1 causes ugly warnings to be added to visible places
# in the extension without removing any functionality (codename "tekstintuho").
# Useful for binary builds that are released for public testing.
Expand Down Expand Up @@ -121,10 +118,6 @@ else
LINK_LIBS += -lvoikko
endif

ifndef ENABLE_GRAMMAR_CHECKER
VOIKKO_CC_DEFINES += -DDISABLE_GRAMMAR_CHECKER
endif

# Build extension package name
ifdef SHOW_UGLY_WARNINGS
VOIKKO_PACKAGENAME:=tekstintuho
Expand Down Expand Up @@ -189,9 +182,6 @@ install-unpacked: extension-files
MANIFEST_SEDSCRIPT:=s/UNOPKG_PLATFORM/$(UNOPKG_PLATFORM)/g
COMPONENTS_SEDSCRIPT:=s/VOIKKO_EXTENSION_SHAREDLIB/$(VOIKKO_EXTENSION_SHAREDLIB)/g
DESCRIPTION_SEDSCRIPT:=s/VOIKKO_VERSION/$(VOIKKO_VERSION)/g
ifdef ENABLE_GRAMMAR_CHECKER
MANIFEST_SEDSCRIPT:=$(MANIFEST_SEDSCRIPT);/GRAMMAR_CHECKER_DISABLED/d
endif
ifdef SHOW_LICENSE
DESCRIPTION_SEDSCRIPT:=$(DESCRIPTION_SEDSCRIPT);/SHOW_LICENSE/d
endif
Expand Down
2 changes: 0 additions & 2 deletions oxt/META-INF/manifest.xml.template
Expand Up @@ -14,10 +14,8 @@
<manifest:file-entry
manifest:media-type="application/vnd.sun.star.configuration-data"
manifest:full-path="SettingsDialog.xcu"/>
<!-- GRAMMAR_CHECKER_DISABLED
<manifest:file-entry
manifest:media-type="application/vnd.sun.star.configuration-data"
manifest:full-path="Linguistic.xcu"/>
GRAMMAR_CHECKER_DISABLED -->
</manifest:manifest>

2 changes: 0 additions & 2 deletions src/registry.cxx
Expand Up @@ -49,12 +49,10 @@ static ::cppu::ImplementationEntry const regEntries[] = {
&Hyphenator::getImplementationName_static,
&Hyphenator::getSupportedServiceNames_static,
&::cppu::createSingleComponentFactory, 0, 0 },
#ifndef DISABLE_GRAMMAR_CHECKER
{ &GrammarChecker::get,
&GrammarChecker::getImplementationName_static,
&GrammarChecker::getSupportedServiceNames_static,
&::cppu::createSingleComponentFactory, 0, 0 },
#endif
{ &regSettingsCreate,
&SettingsEventHandler::getImplementationName_static,
&SettingsEventHandler::getSupportedServiceNames_static,
Expand Down

0 comments on commit 2f6e3b5

Please sign in to comment.