diff options
| author | dennisroczek <dennisroczek@libreoffice.org> | 2017-03-15 16:03:00 +0000 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2017-03-31 15:02:02 +0000 |
| commit | 12e88e3b28fd47c00c87583999053db6ad8660be (patch) | |
| tree | 4b1cffec3f8c427dceb0eb3e3ff7d43dbba8a23a | |
| parent | 351dead74b4c213b13102f81b5ae9bb47ad8ca39 (diff) | |
fix typo: databse --> database
Change-Id: I3ae198eb599a6b0db1be900a2c464ab7b4c20e89
Reviewed-on: https://gerrit.libreoffice.org/35236
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
| -rw-r--r-- | connectivity/source/drivers/firebird/Util.hxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/dlg/generalpage.cxx | 2 | ||||
| -rw-r--r-- | odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile | 20 |
3 files changed, 12 insertions, 12 deletions
diff --git a/connectivity/source/drivers/firebird/Util.hxx b/connectivity/source/drivers/firebird/Util.hxx index 9a452956e3b6..1900ed4b87d1 100644 --- a/connectivity/source/drivers/firebird/Util.hxx +++ b/connectivity/source/drivers/firebird/Util.hxx @@ -34,7 +34,7 @@ namespace connectivity }; /** - * Make sure an identifier is safe to use within the databse. Currently + * Make sure an identifier is safe to use within the database. Currently * firebird seems to return identifiers with 93 character (instead of * 31), whereby the name is simply padded with trailing whitespace. * This removes all trailing whitespace (i.e. if necessary so that diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 54d93741a1b0..e368ca681baf 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -616,7 +616,7 @@ namespace dbaui OUString OGeneralPageWizard::getDatasourceName(const SfxItemSet& _rSet) { - // Sets jdbc as the default selected databse on startup. + // Sets jdbc as the default selected database on startup. if (m_pRB_CreateDatabase->IsChecked() ) return m_pCollection->getTypeDisplayName( "jdbc:" ); diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile index 373acacf9240..567ba11490d2 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile @@ -2,7 +2,7 @@ # # The Contents of this file are made available subject to the terms of # the BSD license. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # All rights reserved. # @@ -29,10 +29,10 @@ # ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR # TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# +# #************************************************************************** -# Builds the Databse SDBC driver skeleton example of the Developers Guide. +# Builds the Database SDBC driver skeleton example of the Developers Guide. PRJ=../../../.. SETTINGS=$(PRJ)/settings @@ -74,7 +74,7 @@ ALL : \ include $(SETTINGS)/stdtarget.mk $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG) - -$(MKDIR) $(subst /,$(PS),$(@D)) + -$(MKDIR) $(subst /,$(PS),$(@D)) $(CC) $(CC_FLAGS) $(CC_INCLUDES) $(STL_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $< ifeq "$(OS)" "WIN" @@ -87,7 +87,7 @@ $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(LINK_MANIFEST) else $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) - -$(MKDIR) $(subst /,$(PS),$(@D)) + -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) $(STC++LIB) ifeq "$(OS)" "MACOSX" @@ -117,8 +117,8 @@ $(COMP_COMPONENTS) : @echo $(OSEP)/components$(CSEP) >> $@ $(COMP_PACKAGE) : $(COMP_LIBRARY) $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS) - -$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@)) - -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_MISC)/$(UNOPKG_PLATFORM)) + -$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@)) + -$(MKDIR) $(subst /,$(PS),$(OUT_COMP_MISC)/$(UNOPKG_PLATFORM)) $(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_COMP_MISC)/$(UNOPKG_PLATFORM)) cd $(subst /,$(PS),$(OUT_COMP_MISC)) && $(SDK_ZIP) ../../bin/$(@F) $(COMP_NAME).components cd $(subst /,$(PS),$(OUT_COMP_MISC)) && $(SDK_ZIP) -u ../../bin/$(@F) $(UNOPKG_PLATFORM)/$(<F) @@ -126,15 +126,15 @@ $(COMP_PACKAGE) : $(COMP_LIBRARY) $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS) $(COMP_REGISTERFLAG) : $(COMP_PACKAGE) ifeq "$(SDK_AUTO_DEPLOYMENT)" "YES" - -$(MKDIR) $(subst /,$(PS),$(@D)) + -$(MKDIR) $(subst /,$(PS),$(@D)) -$(DEL) $(subst \\,\,$(subst /,$(PS),$@)) $(DEPLOYTOOL) $(COMP_PACKAGE_URL) @echo flagged > $(subst /,$(PS),$@) else @echo -------------------------------------------------------------------------------- @echo If you want to install your component automatically, please set the environment - @echo variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only - @echo possible if no office instance is running. + @echo variable SDK_AUTO_DEPLOYMENT = YES. But note that auto deployment is only + @echo possible if no office instance is running. @echo -------------------------------------------------------------------------------- endif |